From a7950590b317f56124d572495beb4c0c8948a764 Mon Sep 17 00:00:00 2001 From: Samuel Villareal Date: Thu, 2 Sep 2010 03:58:58 +0000 Subject: + Update to PIT_CheckThing Subversion-branch: /branches/strife-branch Subversion-revision: 1996 --- src/strife/p_map.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/strife/p_map.c b/src/strife/p_map.c index 31366a36..ebc6d78e 100644 --- a/src/strife/p_map.c +++ b/src/strife/p_map.c @@ -313,13 +313,13 @@ boolean PIT_CheckThing (mobj_t* thing) if (thing == tmthing) return true; - // villsa [STRIFE] check thing z/height against tmthing's z + // villsa [STRIFE] see if it went over / under if(thing->height + thing->z < tmthing->z) - return true; + return true; // overhead - // villsa [STRIFE] check tmthing z/height against thing's z + // villsa [STRIFE] see if it went over / under if (tmthing->z + tmthing->height < thing->z) - return true; + return true; // underneath // villsa [STRIFE] unused // check for skulls slamming into things @@ -341,11 +341,13 @@ boolean PIT_CheckThing (mobj_t* thing) // missiles can hit other things if (tmthing->flags & MF_MISSILE) { + // villsa [STRIFE] this code here has been moved at the beginning of this function + // TODO - verify // see if it went over / under - if (tmthing->z > thing->z + thing->height) + /*if (tmthing->z > thing->z + thing->height) return true; // overhead if (tmthing->z+tmthing->height < thing->z) - return true; // underneath + return true; // underneath*/ // villsa [STRIFE] TODO - update to strife version if (tmthing->target -- cgit v1.2.3