Fix -levelstat command

Co-Authored-By: Roman Fomin <rfomin@gmail.com>
JNechaevsky · Dec 25, 2024 · cd1ca3d · cd1ca3d
1 parent e1e5eb9
commit cd1ca3d
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 18 deletions.
diff --git a/src/doom/g_game.c b/src/doom/g_game.c
@@ -2062,7 +2062,7 @@ static void G_FormatLevelStatTime(char *str, int tics)
 // [crispy] Write level statistics upon exit
 static void G_WriteLevelStat(void)
 {
-    static FILE *fstream = NULL;
+    FILE *fstream;
 
     int i, playerKills = 0, playerItems = 0, playerSecrets = 0;
 
@@ -2071,15 +2071,22 @@ static void G_WriteLevelStat(void)
     char totalTimeString[TIMESTRSIZE];
     char *decimal;
 
-    if (fstream == NULL)
+    static boolean firsttime = true;
+
+    if (firsttime)
+    {
+        firsttime = false;
+        fstream = M_fopen("levelstat.txt", "w");
+    }
+    else
     {
-        fstream = fopen("levelstat.txt", "w");
+        fstream = M_fopen("levelstat.txt", "a");
+    }
 
-        if (fstream == NULL)
-        {
-            fprintf(stderr, "G_WriteLevelStat: Unable to open levelstat.txt for writing!\n");
-            return;
-        }
+    if (fstream == NULL)
+    {
+        fprintf(stderr, "G_WriteLevelStat: Unable to open levelstat.txt for writing!\n");
+        return;
     }
 
     if (gamemode == commercial)
@@ -2116,6 +2123,8 @@ static void G_WriteLevelStat(void)
             levelString, (secretexit ? "s" : ""),
             levelTimeString, totalTimeString, playerKills, totalkills, 
             playerItems, totalitems, playerSecrets, totalsecret);
+
+    fclose(fstream);
 }
 
 void G_DoCompleted (void) 

diff --git a/src/heretic/g_game.c b/src/heretic/g_game.c
@@ -2224,25 +2224,36 @@ static void G_FormatLevelStatTime(char *str, int tics)
 // [crispy] Write level statistics upon exit
 static void G_WriteLevelStat(void)
 {
-    static FILE *fstream = NULL;
+    FILE *fstream;
 
     int i, playerKills = 0, playerItems = 0, playerSecrets = 0;
 
+    char levelString[8];
     char levelTimeString[TIMESTRSIZE];
     char totalTimeString[TIMESTRSIZE];
     char *decimal;
 
-    if (fstream == NULL)
+    static boolean firsttime = true;
+
+    if (firsttime)
     {
-        fstream = fopen("levelstat.txt", "w");
+        firsttime = false;
+        fstream = M_fopen("levelstat.txt", "w");
+    }
+    else
+    {
+        fstream = M_fopen("levelstat.txt", "a");
+    }
 
-        if (fstream == NULL)
-        {
-            fprintf(stderr, "G_WriteLevelStat: Unable to open levelstat.txt for writing!\n");
-            return;
-        }
+    if (fstream == NULL)
+    {
+        fprintf(stderr, "G_WriteLevelStat: Unable to open levelstat.txt for writing!\n");
+        return;
     }
 
+    M_snprintf(levelString, sizeof(levelString), "E%dM%d",
+                gameepisode, gamemap);
+
     G_FormatLevelStatTime(levelTimeString, leveltime);
     G_FormatLevelStatTime(totalTimeString, totalleveltimes + leveltime);
 
@@ -2263,10 +2274,12 @@ static void G_WriteLevelStat(void)
         }
     }
 
-    fprintf(fstream, "E%dM%d%s - %s (%s)  K: %d/%d  I: %d/%d  S: %d/%d\n",
-            gameepisode, gamemap, (secretexit ? "s" : ""),
+    fprintf(fstream, "%s%s - %s (%s)  K: %d/%d  I: %d/%d  S: %d/%d\n",
+            levelString, (secretexit ? "s" : ""),
             levelTimeString, totalTimeString, playerKills, totalkills, 
             playerItems, totalitems, playerSecrets, totalsecret);
+
+    fclose(fstream);
 }
 
 void G_DoCompleted(void)