diff options
author | Simon Howard | 2010-01-27 19:50:30 +0000 |
---|---|---|
committer | Simon Howard | 2010-01-27 19:50:30 +0000 |
commit | 0b8bf3cfe37a3d6e8ad01c0f6726430f53c0ad7e (patch) | |
tree | 483f983aacbd9907290cf61f0e3b3afb1b03f7e9 /src/st_stuff.c | |
parent | 3cf74a97261b1a0aceb591b495b0857781918edd (diff) | |
parent | a9e2d244a5a37fed344405e40698de2a2969c12a (diff) | |
download | chocolate-doom-0b8bf3cfe37a3d6e8ad01c0f6726430f53c0ad7e.tar.gz chocolate-doom-0b8bf3cfe37a3d6e8ad01c0f6726430f53c0ad7e.tar.bz2 chocolate-doom-0b8bf3cfe37a3d6e8ad01c0f6726430f53c0ad7e.zip |
Merge from trunk.
Subversion-branch: /branches/opl-branch
Subversion-revision: 1829
Diffstat (limited to 'src/st_stuff.c')
-rw-r--r-- | src/st_stuff.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/st_stuff.c b/src/st_stuff.c index f92d2dda..d48609b4 100644 --- a/src/st_stuff.c +++ b/src/st_stuff.c @@ -259,9 +259,6 @@ // Height, in lines. #define ST_OUTHEIGHT 1 -#define ST_MAPWIDTH \ - (strlen(mapnames[(gameepisode-1)*9+(gamemap-1)])) - #define ST_MAPTITLEX \ (SCREENWIDTH - ST_MAPWIDTH * ST_CHATFONTWIDTH) @@ -418,10 +415,6 @@ cheatseq_t cheat_clev = CHEAT("idclev", 2); cheatseq_t cheat_mypos = CHEAT("idmypos", 0); -// -extern char* mapnames[]; - - // // STATUS BAR CODE // @@ -981,6 +974,17 @@ void ST_doPaletteStuff(void) else palette = 0; + // In Chex Quest, the player never sees red. Instead, the + // radiation suit palette is used to tint the screen green, + // as though the player is being covered in goo by an + // attacking flemoid. + + if (gameversion == exe_chex + && palette >= STARTREDPALS && palette < STARTREDPALS + NUMREDPALS) + { + palette = RADIATIONPAL; + } + if (palette != st_palette) { st_palette = palette; |