diff options
author | Samuel Villareal | 2010-09-05 05:05:17 +0000 |
---|---|---|
committer | Samuel Villareal | 2010-09-05 05:05:17 +0000 |
commit | 289ae90614062bf5ab367a1befcec98ab99e7094 (patch) | |
tree | fa3602dd719f9f815799e6b25d356dc32d0cd067 /src/strife/p_user.c | |
parent | 1fc397741ffd103629cce3d06946865a7bc437c3 (diff) | |
download | chocolate-doom-289ae90614062bf5ab367a1befcec98ab99e7094.tar.gz chocolate-doom-289ae90614062bf5ab367a1befcec98ab99e7094.tar.bz2 chocolate-doom-289ae90614062bf5ab367a1befcec98ab99e7094.zip |
+ A_FireSigil implemented
+ P_PlayerThink updated (checks for extralight)
+ New cheats added to cheat_t
Subversion-branch: /branches/strife-branch
Subversion-revision: 2011
Diffstat (limited to 'src/strife/p_user.c')
-rw-r--r-- | src/strife/p_user.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/src/strife/p_user.c b/src/strife/p_user.c index 5a140190..12bc686f 100644 --- a/src/strife/p_user.c +++ b/src/strife/p_user.c @@ -448,9 +448,21 @@ void P_PlayerThink (player_t* player) if (player->bonuscount) player->bonuscount--; + // villsa [STRIFE] checks for extralight + if(player->extralight >= 0) + { + if(player->cheats & CF_ONFIRE) + player->fixedcolormap = 1; + else + player->fixedcolormap = 0; + } + else + player->fixedcolormap = INVERSECOLORMAP; + + // villsa [STRIFE] unused // Handling colormaps. - if (player->powers[pw_invulnerability]) + /*if (player->powers[pw_invulnerability]) { if (player->powers[pw_invulnerability] > 4*32 || (player->powers[pw_invulnerability]&8) ) @@ -470,7 +482,7 @@ void P_PlayerThink (player_t* player) player->fixedcolormap = 0; } else - player->fixedcolormap = 0; + player->fixedcolormap = 0;*/ } |