ref: c2c54b9b246de518d49be15f1c0de6261e50823b
parent: 41eebca5614912abe656e443668b11214c6d51c1
author: Nuke.YKT <alexeytf2@gmail.com>
date: Sun Jul 26 16:29:43 EDT 2015
doom:Chex's map name handling fix Chex Quest exe for E1M6-E4M9 maps shows E1M5 map name.
--- a/src/doom/hu_stuff.c
+++ b/src/doom/hu_stuff.c
@@ -48,7 +48,7 @@
#define HU_TITLE2 (mapnames_commercial[gamemap-1])
#define HU_TITLEP (mapnames_commercial[gamemap-1 + 32])
#define HU_TITLET (mapnames_commercial[gamemap-1 + 64])
-#define HU_TITLE_CHEX (mapnames[gamemap - 1])
+#define HU_TITLE_CHEX (mapnames_chex[(gameepisode-1)*9+gamemap-1])
#define HU_TITLEHEIGHT 1
#define HU_TITLEX 0
#define HU_TITLEY (167 - SHORT(hu_font[0]->height))
@@ -163,6 +163,60 @@
"NEWLEVEL"
};
+char* mapnames_chex[] = // Chex Quest names.
+{+
+ HUSTR_E1M1,
+ HUSTR_E1M2,
+ HUSTR_E1M3,
+ HUSTR_E1M4,
+ HUSTR_E1M5,
+ HUSTR_E1M5,
+ HUSTR_E1M5,
+ HUSTR_E1M5,
+ HUSTR_E1M5,
+
+ HUSTR_E1M5,
+ HUSTR_E1M5,
+ HUSTR_E1M5,
+ HUSTR_E1M5,
+ HUSTR_E1M5,
+ HUSTR_E1M5,
+ HUSTR_E1M5,
+ HUSTR_E1M5,
+ HUSTR_E1M5,
+
+ HUSTR_E1M5,
+ HUSTR_E1M5,
+ HUSTR_E1M5,
+ HUSTR_E1M5,
+ HUSTR_E1M5,
+ HUSTR_E1M5,
+ HUSTR_E1M5,
+ HUSTR_E1M5,
+ HUSTR_E1M5,
+
+ HUSTR_E1M5,
+ HUSTR_E1M5,
+ HUSTR_E1M5,
+ HUSTR_E1M5,
+ HUSTR_E1M5,
+ HUSTR_E1M5,
+ HUSTR_E1M5,
+ HUSTR_E1M5,
+ HUSTR_E1M5,
+
+ "NEWLEVEL",
+ "NEWLEVEL",
+ "NEWLEVEL",
+ "NEWLEVEL",
+ "NEWLEVEL",
+ "NEWLEVEL",
+ "NEWLEVEL",
+ "NEWLEVEL",
+ "NEWLEVEL"
+};
+
// List of names for levels in commercial IWADs
// (doom2.wad, plutonia.wad, tnt.wad). These are stored in a
// single large array; WADs like pl2.wad have a MAP33, and rely on
@@ -351,10 +405,7 @@
break;
}
- // Chex.exe always uses the episode 1 level title
- // eg. E2M1 gives the title for E1M1
-
- if (gameversion == exe_chex)
+ if (logical_gamemission == doom && gameversion == exe_chex)
{s = HU_TITLE_CHEX;
}