diff options
| author | Simon Howard | 2008-09-20 23:23:20 +0000 |
|---|---|---|
| committer | Simon Howard | 2008-09-20 23:23:20 +0000 |
| commit | 24cccc7029e2dc6d07d483ee5a8d467d733000ef (patch) | |
| tree | 45e9116b0a22b5061117e178a2d90b0c7363769a /src/heretic/p_inter.c | |
| parent | b3fdd717d3d0a9255a035f99af0cb2e6c1515008 (diff) | |
| download | chocolate-doom-24cccc7029e2dc6d07d483ee5a8d467d733000ef.tar.gz chocolate-doom-24cccc7029e2dc6d07d483ee5a8d467d733000ef.tar.bz2 chocolate-doom-24cccc7029e2dc6d07d483ee5a8d467d733000ef.zip | |
Harmonise heretic code on TICRATE and use definition in i_timer.h.
Subversion-branch: /branches/raven-branch
Subversion-revision: 1262
Diffstat (limited to 'src/heretic/p_inter.c')
| -rw-r--r-- | src/heretic/p_inter.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/heretic/p_inter.c b/src/heretic/p_inter.c index 20ab5013..25ac3808 100644 --- a/src/heretic/p_inter.c +++ b/src/heretic/p_inter.c @@ -25,6 +25,7 @@ #include "doomdef.h" #include "i_system.h" +#include "i_timer.h" #include "m_random.h" #include "p_local.h" #include "s_sound.h" @@ -1036,7 +1037,7 @@ boolean P_ChickenMorphPlayer(player_t * player) if (player->chickenTics) { - if ((player->chickenTics < CHICKENTICS - TICSPERSEC) + if ((player->chickenTics < CHICKENTICS - TICRATE) && !player->powers[pw_weaponlevel2]) { // Make a super chicken P_GivePower(player, pw_weaponlevel2); |