summaryrefslogtreecommitdiff
path: root/src/strife
diff options
context:
space:
mode:
authorSamuel Villareal2010-09-06 23:26:39 +0000
committerSamuel Villareal2010-09-06 23:26:39 +0000
commitd95111bc5c481f7ccd155d8a8d8064d81b0180ac (patch)
treea803baa2596bdda232caf4d8c31131d4704ddb10 /src/strife
parentd1fc5eb5e8e11fa231383a2aa02d275429b06dfa (diff)
downloadchocolate-doom-d95111bc5c481f7ccd155d8a8d8064d81b0180ac.tar.gz
chocolate-doom-d95111bc5c481f7ccd155d8a8d8064d81b0180ac.tar.bz2
chocolate-doom-d95111bc5c481f7ccd155d8a8d8064d81b0180ac.zip
+ Corrected some mistakes in P_ZMovement
Subversion-branch: /branches/strife-branch Subversion-revision: 2028
Diffstat (limited to 'src/strife')
-rw-r--r--src/strife/p_mobj.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/strife/p_mobj.c b/src/strife/p_mobj.c
index 70907fb6..79f6398d 100644
--- a/src/strife/p_mobj.c
+++ b/src/strife/p_mobj.c
@@ -350,7 +350,7 @@ void P_ZMovement (mobj_t* mo)
// villsa [STRIFE] get terrain type
if(P_GetTerrainType(mo) != FLOOR_SOLID)
- mo->flags &= ~MF_FEETCLIPPED;
+ mo->flags &= ~MF_BOUNCE;
}
if (mo->momz < 0)
@@ -392,12 +392,7 @@ void P_ZMovement (mobj_t* mo)
if ( (mo->flags & MF_MISSILE)
&& !(mo->flags & (MF_NOCLIP|MF_BOUNCE)) )
{
- // villsa [STRIFE] check against skies
- if(mo->subsector->sector->ceilingpic == skyflatnum)
- P_RemoveMobj(mo);
- else
- P_ExplodeMissile (mo);
-
+ P_ExplodeMissile (mo);
return;
}
}