foxygit / doom Log in
commit d95111bc5c481f7ccd155d8a8d8064d81b0180ac
Author:     Samuel Villareal <svkaiser@gmail.com>
AuthorDate: Mon Sep 6 23:26:39 2010 +0000
Commit:     Samuel Villareal <svkaiser@gmail.com>
CommitDate: Mon Sep 6 23:26:39 2010 +0000

    + Corrected some mistakes in P_ZMovement

    Subversion-branch: /branches/strife-branch
    Subversion-revision: 2028
---
 src/strife/p_mobj.c | 9 ++-------
 1 file 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;
 	}
     }