More minor tweaks

bradharding · Dec 10, 2023 · a54dcaa · a54dcaa
1 parent 96651fc
commit a54dcaa
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/res/DEHACKED.lmp b/res/DEHACKED.lmp
@@ -382,6 +382,7 @@ M_EPISODE6 = Sigil II
 M_WHICHEXPANSION = Which Expansion?
 M_EXPANSION1 = Hell on Earth
 M_EXPANSION2 = No Rest for the Living
+M_EXPANSION3 = Hellion
 M_CHOOSESKILLLEVEL = Choose Skill Level:
 M_SKILLLEVEL1 = I'm too young to die.
 M_SKILLLEVEL2 = Hey, not too rough.
@@ -413,6 +414,7 @@ CAPTION_EPISODE5 = SIGIL
 CAPTION_EPISODE6 = SIGIL II
 CAPTION_EXPANSION1 = Hell On Earth
 CAPTION_EXPANSION2 = No Rest For The Living
+CAPTION_EXPANSION3 = Hellion
 CAPTION_PLUTONIA = Final DOOM: The Plutonia Experiment
 CAPTION_TNT = Final DOOM: TNT - Evilution
 CAPTION_CHEX = Chex Quest

diff --git a/res/M_EPI6.png b/res/M_EPI6.png
diff --git a/res/doomretro.wad b/res/doomretro.wad
diff --git a/src/d_deh.c b/src/d_deh.c
@@ -597,7 +597,6 @@ char    *s_M_CONSOLE = "";
 char    *s_M_SFXVOLUME = "";
 char    *s_M_MUSICVOLUME = "";
 char    *s_M_PAUSED = "";
-char    *s_M_MORE = "";
 
 char    *s_CAPTION_DOOM = "";
 char    *s_CAPTION_DOOM2 = "";
@@ -609,6 +608,7 @@ char    *s_CAPTION_EPISODE5 = "";
 char    *s_CAPTION_EPISODE6 = "";
 char    *s_CAPTION_EXPANSION1 = "";
 char    *s_CAPTION_EXPANSION2 = "";
+char    *s_CAPTION_EXPANSION3 = "";
 char    *s_CAPTION_PLUTONIA = "";
 char    *s_CAPTION_TNT = "";
 char    *s_CAPTION_CHEX = "";
@@ -1217,7 +1217,6 @@ deh_strs deh_strlookup[] =
     { &s_M_SFXVOLUME,                 "M_SFXVOLUME"                 },
     { &s_M_MUSICVOLUME,               "M_MUSICVOLUME"               },
     { &s_M_PAUSED,                    "M_PAUSED"                    },
-    { &s_M_MORE,                      "M_MORE"                      },
 
     { &s_CAPTION_DOOM,                "CAPTION_DOOM"                },
     { &s_CAPTION_DOOM2,               "CAPTION_DOOM2"               },
@@ -1229,6 +1228,7 @@ deh_strs deh_strlookup[] =
     { &s_CAPTION_EPISODE6,            "CAPTION_EPISODE6"            },
     { &s_CAPTION_EXPANSION1,          "CAPTION_EXPANSION1"          },
     { &s_CAPTION_EXPANSION2,          "CAPTION_EXPANSION2"          },
+    { &s_CAPTION_EXPANSION3,          "CAPTION_EXPANSION3"          },
     { &s_CAPTION_PLUTONIA,            "CAPTION_PLUTONIA"            },
     { &s_CAPTION_TNT,                 "CAPTION_TNT"                 },
     { &s_CAPTION_CHEX,                "CAPTION_CHEX"                },

diff --git a/src/d_deh.h b/src/d_deh.h
@@ -463,7 +463,6 @@ extern char         *s_M_CONSOLE;
 extern char         *s_M_SFXVOLUME;
 extern char         *s_M_MUSICVOLUME;
 extern char         *s_M_PAUSED;
-extern char         *s_M_MORE;
 
 extern char         *s_CAPTION_DOOM;
 extern char         *s_CAPTION_DOOM2;
@@ -475,6 +474,7 @@ extern char         *s_CAPTION_EPISODE5;
 extern char         *s_CAPTION_EPISODE6;
 extern char         *s_CAPTION_EXPANSION1;
 extern char         *s_CAPTION_EXPANSION2;
+extern char         *s_CAPTION_EXPANSION3;
 extern char         *s_CAPTION_PLUTONIA;
 extern char         *s_CAPTION_TNT;
 extern char         *s_CAPTION_CHEX;

diff --git a/src/d_main.c b/src/d_main.c
@@ -827,9 +827,7 @@ bool D_IsSIGILWAD(char *filename)
 
 bool D_IsSIGIL2WAD(char *filename)
 {
-    const char *file = leafname(filename);
-
-    return (M_StringCompare(file, "SIGIL_II_V1_0.WAD"));
+    return (M_StringStartsWith(leafname(filename), "SIGIL_II_V"));
 }
 
 bool D_IsDOOM2IWAD(char *filename)