diff options
| author | Samuel Villareal | 2010-08-31 06:24:10 +0000 |
|---|---|---|
| committer | Samuel Villareal | 2010-08-31 06:24:10 +0000 |
| commit | 468d5afbf0fc6c03bcef355f5f8f04089ac805a8 (patch) | |
| tree | 09c3edf0da583669999fe11c209b5a9e130d12af /src/strife/p_inter.c | |
| parent | 5e95f6d6b0515b0b853c89681516c955160c2ef9 (diff) | |
| download | chocolate-doom-468d5afbf0fc6c03bcef355f5f8f04089ac805a8.tar.gz chocolate-doom-468d5afbf0fc6c03bcef355f5f8f04089ac805a8.tar.bz2 chocolate-doom-468d5afbf0fc6c03bcef355f5f8f04089ac805a8.zip | |
+ All doom mobjtypes commented out or replaced as placeholders
+ Strife mobjinfo structure filled
+ strife mobj flags added
Subversion-branch: /branches/strife-branch
Subversion-revision: 1985
Diffstat (limited to 'src/strife/p_inter.c')
| -rw-r--r-- | src/strife/p_inter.c | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/src/strife/p_inter.c b/src/strife/p_inter.c index 0f0ca797..2258856e 100644 --- a/src/strife/p_inter.c +++ b/src/strife/p_inter.c @@ -656,7 +656,9 @@ P_TouchSpecialThing break;*/ default: - I_Error ("P_SpecialThing: Unknown gettable thing"); + // villsa [STRIFE] TODO - disabled for now until all things are filled + return; + //I_Error ("P_SpecialThing: Unknown gettable thing"); } // haleyjd 08/30/10: [STRIFE] No itemcount @@ -682,8 +684,9 @@ P_KillMobj target->flags &= ~(MF_SHOOTABLE|MF_FLOAT|MF_SKULLFLY); - if (target->type != MT_SKULL) - target->flags &= ~MF_NOGRAVITY; + // villsa [STRIFE] unused + /*if (target->type != MT_SKULL) + target->flags &= ~MF_NOGRAVITY;*/ target->flags |= MF_CORPSE|MF_DROPOFF; target->height >>= 2; @@ -750,7 +753,8 @@ P_KillMobj // during the death frame of a thing. switch (target->type) { - case MT_WOLFSS: + // villsa [STRIFE] TODO - fix me + /*case MT_WOLFSS: case MT_POSSESSED: item = MT_CLIP; break; @@ -761,7 +765,7 @@ P_KillMobj case MT_CHAINGUY: item = MT_CHAINGUN; - break; + break;*/ default: return; @@ -915,9 +919,10 @@ P_DamageMobj target->reactiontime = 0; // we're awake now... - if ( (!target->threshold || target->type == MT_VILE) + // villsa [STRIFE] TODO - update to strife version + if ( (!target->threshold /*|| target->type == MT_VILE*/) && source && source != target - && source->type != MT_VILE) + /*&& source->type != MT_VILE*/) { // if not intent on another player, // chase after this one |