diff options
| author | Samuel Villareal | 2010-09-02 03:50:59 +0000 |
|---|---|---|
| committer | Samuel Villareal | 2010-09-02 03:50:59 +0000 |
| commit | 415940729df099709b9ffc8bfdd3eb5a52b2823d (patch) | |
| tree | 84ad205192e822a1683449fc207d12120b06d377 /src/strife/p_inter.c | |
| parent | 87185424769c6c2dd8207f0b63dc787f98011496 (diff) | |
| download | chocolate-doom-415940729df099709b9ffc8bfdd3eb5a52b2823d.tar.gz chocolate-doom-415940729df099709b9ffc8bfdd3eb5a52b2823d.tar.bz2 chocolate-doom-415940729df099709b9ffc8bfdd3eb5a52b2823d.zip | |
+ Thing z height clipping code added
+ Renamed MF_SKULLFLY to MF_BOUNCE
+ Updated P_ZMovement with Strife changes
+ Updates to PIT_CheckThing
+ Removed most references to MF_SKULLFLY
Subversion-branch: /branches/strife-branch
Subversion-revision: 1995
Diffstat (limited to 'src/strife/p_inter.c')
| -rw-r--r-- | src/strife/p_inter.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/strife/p_inter.c b/src/strife/p_inter.c index 2258856e..ab94cd57 100644 --- a/src/strife/p_inter.c +++ b/src/strife/p_inter.c @@ -682,7 +682,8 @@ P_KillMobj mobjtype_t item; mobj_t* mo; - target->flags &= ~(MF_SHOOTABLE|MF_FLOAT|MF_SKULLFLY); + // villsa [STRIFE] MF_SPECIAL is added in the check + target->flags &= ~(MF_SHOOTABLE|MF_FLOAT|MF_BOUNCE|MF_SPECIAL); // villsa [STRIFE] unused /*if (target->type != MT_SKULL) @@ -808,10 +809,11 @@ P_DamageMobj if (target->health <= 0) return; - if ( target->flags & MF_SKULLFLY ) + // villsa [STRIFE] unused + /*if ( target->flags & MF_SKULLFLY ) { target->momx = target->momy = target->momz = 0; - } + }*/ player = target->player; if (player && gameskill == sk_baby) @@ -910,7 +912,7 @@ P_DamageMobj } if ( (P_Random () < target->info->painchance) - && !(target->flags&MF_SKULLFLY) ) + /*&& !(target->flags&MF_SKULLFLY)*/ ) // villsa [STRIFE] unused flag { target->flags |= MF_JUSTHIT; // fight back! |