Minor tweaks

bradharding · Dec 6, 2023 · 84a7a59 · 84a7a59
1 parent 19ba10b
commit 84a7a59
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 27 deletions.
diff --git a/src/c_cmds.c b/src/c_cmds.c
@@ -6106,7 +6106,7 @@ static void C_PlayerStats_Game(void)
 
     temp1 = commify(viewplayer->cheated);
     temp2 = commifystat(stat_cheats);
-    C_TabbedOutput(tabs, "Cheats\t%s\t%s", temp1, temp2);
+    C_TabbedOutput(tabs, "Cheats entered\t%s\t%s", temp1, temp2);
     free(temp1);
     free(temp2);
 
@@ -6543,7 +6543,7 @@ static void C_PlayerStats_NoGame(void)
     free(temp1);
 
     temp1 = commifystat(stat_cheats);
-    C_TabbedOutput(tabs, "Cheats\t\x96\t%s", temp1);
+    C_TabbedOutput(tabs, "Cheats entered\t\x96\t%s", temp1);
     free(temp1);
 
     temp1 = commify((shotssuccessful = stat_shotssuccessful_fists + stat_shotssuccessful_chainsaw + stat_shotssuccessful_pistol

diff --git a/src/d_main.c b/src/d_main.c
@@ -1987,21 +1987,6 @@ static void D_ProcessDehInWad(void)
     }
 }
 
-static void D_ParseStartupString(const char *string)
-{
-    const size_t    len = strlen(string);
-
-    for (size_t i = 0, start = 0; i < len; i++)
-        if (string[i] == '\n' || i == len - 1)
-        {
-            char    *temp = M_SubString(string, start, i - start);
-
-            C_Output(temp);
-            start = i + 1;
-            free(temp);
-        }
-}
-
 //
 // D_DoomMainSetup
 //

diff --git a/src/p_inter.c b/src/p_inter.c
@@ -1646,9 +1646,9 @@ static void P_WriteObituary(mobj_t *target, mobj_t *inflicter, mobj_t *source, c
             }
 
             if (M_StringCompare(playername, playername_default))
-                C_PlayerMessage("You have been telefragged by %s!", sourcename);
+                C_PlayerMessage("You were telefragged by %s!", sourcename);
             else
-                C_PlayerMessage("%s has been telefragged by %s!", playername, sourcename);
+                C_PlayerMessage("%s was telefragged by %s!", playername, sourcename);
         }
         else if (source->player)
         {
@@ -1715,12 +1715,12 @@ static void P_WriteObituary(mobj_t *target, mobj_t *inflicter, mobj_t *source, c
                 if (inflicter->inflicter == MT_PLAYER)
                 {
                     if (M_StringCompare(playername, playername_default))
-                        C_PlayerMessage("You have been %s by %s %s you exploded!",
+                        C_PlayerMessage("You were %s by %s %s you exploded!",
                             (gibbed ? s_GIBBED : s_KILLED),
                             (inflictername && isvowel(inflictername[0]) ? "an" : "a"),
                             (inflictername ? inflictername : "barrel"));
                     else
-                        C_PlayerMessage("%s has been %s by %s %s %s exploded!",
+                        C_PlayerMessage("%s was %s by %s %s %s exploded!",
                             playername,
                             (gibbed ? s_GIBBED : s_KILLED),
                             (inflictername && isvowel(inflictername[0]) ? "an" : "a"),
@@ -1730,7 +1730,7 @@ static void P_WriteObituary(mobj_t *target, mobj_t *inflicter, mobj_t *source, c
                 else
                 {
                     if (M_StringCompare(playername, playername_default))
-                        C_PlayerMessage("You have been %s by %s %s that %s %s exploded!",
+                        C_PlayerMessage("You were %s by %s %s that %s %s exploded!",
                             (gibbed ? s_GIBBED : s_KILLED),
                             (inflictername && isvowel(inflictername[0]) ? "an" : "a"),
                             (inflictername ? inflictername : "barrel"),
@@ -1739,7 +1739,7 @@ static void P_WriteObituary(mobj_t *target, mobj_t *inflicter, mobj_t *source, c
                                 (isvowel(mobjinfo[inflicter->inflicter].name1[0]) ? "an" : "a")),
                             (*mobjinfo[inflicter->inflicter].name1 ? mobjinfo[inflicter->inflicter].name1 : "monster"));
                     else
-                        C_PlayerMessage("%s has been %s by %s %s that %s %s exploded!",
+                        C_PlayerMessage("%s was %s by %s %s that %s %s exploded!",
                             playername,
                             (gibbed ? s_GIBBED : s_KILLED),
                             (inflictername && isvowel(inflictername[0]) ? "an" : "a"),
@@ -1917,10 +1917,10 @@ static void P_WriteObituary(mobj_t *target, mobj_t *inflicter, mobj_t *source, c
             if (target->player)
             {
                 if (M_StringCompare(playername, playername_default))
-                    C_PlayerMessage("You have been %s by %s!",
+                    C_PlayerMessage("You were %s by %s!",
                         (gibbed ? s_GIBBED : s_KILLED), sourcename);
                 else
-                    C_PlayerMessage("%s has been %s by %s!",
+                    C_PlayerMessage("%s was %s by %s!",
                         playername, (gibbed ? s_GIBBED : s_KILLED), sourcename);
             }
             else
@@ -1958,9 +1958,9 @@ static void P_WriteObituary(mobj_t *target, mobj_t *inflicter, mobj_t *source, c
         if (sector->ceilingdata && sector->ceilingheight - sector->floorheight < VIEWHEIGHT)
         {
             if (M_StringCompare(playername, playername_default))
-                C_PlayerMessage("You have been crushed to death!");
+                C_PlayerMessage("You were crushed to death!");
             else
-                C_PlayerMessage("%s has been crushed to death!", playername);
+                C_PlayerMessage("%s was crushed to death!", playername);
         }
         else
         {