diff options
author | Simon Howard | 2010-02-05 23:08:12 +0000 |
---|---|---|
committer | Simon Howard | 2010-02-05 23:08:12 +0000 |
commit | 677729c658b39f075e563fbc9f5a898641f7de54 (patch) | |
tree | 109bae4ac22fbc6f8a34ba34a4e9fc6a33e75c48 /src/doom/st_stuff.c | |
parent | 8a77b34e936a3fd752db3bc1113e3d7bd0555440 (diff) | |
parent | b4f2d75b34b6e2b9bbb2fa6449125d3446a93a73 (diff) | |
download | chocolate-doom-677729c658b39f075e563fbc9f5a898641f7de54.tar.gz chocolate-doom-677729c658b39f075e563fbc9f5a898641f7de54.tar.bz2 chocolate-doom-677729c658b39f075e563fbc9f5a898641f7de54.zip |
Merge from trunk.
Subversion-branch: /branches/raven-branch
Subversion-revision: 1845
Diffstat (limited to 'src/doom/st_stuff.c')
-rw-r--r-- | src/doom/st_stuff.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/doom/st_stuff.c b/src/doom/st_stuff.c index e6ef0828..160244ce 100644 --- a/src/doom/st_stuff.c +++ b/src/doom/st_stuff.c @@ -260,9 +260,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 // @@ -985,6 +978,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; |