diff options
| author | Simon Howard | 2008-07-26 23:51:25 +0000 |
|---|---|---|
| committer | Simon Howard | 2008-07-26 23:51:25 +0000 |
| commit | 530888d2e243f27bd36aa71a68570195276c4173 (patch) | |
| tree | 533fa9170aa8f8fd259b035a11641780b2d31af2 | |
| parent | 6e8d5f118991efdc040f367b208f32219457bb39 (diff) | |
| download | chocolate-doom-530888d2e243f27bd36aa71a68570195276c4173.tar.gz chocolate-doom-530888d2e243f27bd36aa71a68570195276c4173.tar.bz2 chocolate-doom-530888d2e243f27bd36aa71a68570195276c4173.zip | |
In chex mode, always warp to an episode 1 level, and display the level
title in the automap for the equivalent episode 1 level.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1159
| -rw-r--r-- | src/hu_stuff.c | 11 | ||||
| -rw-r--r-- | src/st_stuff.c | 9 |
2 files changed, 18 insertions, 2 deletions
diff --git a/src/hu_stuff.c b/src/hu_stuff.c index e6699438..886236ba 100644 --- a/src/hu_stuff.c +++ b/src/hu_stuff.c @@ -53,6 +53,7 @@ #define HU_TITLE2 (mapnames2[gamemap-1]) #define HU_TITLEP (mapnamesp[gamemap-1]) #define HU_TITLET (mapnamest[gamemap-1]) +#define HU_TITLE_CHEX (mapnames[gamemap - 1]) #define HU_TITLEHEIGHT 1 #define HU_TITLEX 0 #define HU_TITLEY (167 - SHORT(hu_font[0]->height)) @@ -395,7 +396,15 @@ void HU_Start(void) s = "Unknown level"; break; } - + + // Chex.exe always uses the episode 1 level title + // eg. E2M1 gives the title for E1M1 + + if (gameversion == exe_chex) + { + s = HU_TITLE_CHEX; + } + // dehacked substitution to get modified level name s = DEH_String(s); diff --git a/src/st_stuff.c b/src/st_stuff.c index 766a0ec1..f92d2dda 100644 --- a/src/st_stuff.c +++ b/src/st_stuff.c @@ -624,13 +624,20 @@ ST_Responder (event_t* ev) map = buf[1] - '0'; } + // Chex.exe always warps to episode 1. + + if (gameversion == exe_chex) + { + epsd = 1; + } + // Catch invalid maps. if (epsd < 1) return false; if (map < 1) return false; - + // Ohmygod - this is not going to work. if ((gamemode == retail) && ((epsd > 4) || (map > 9))) |