shithub: choc

Download patch

ref: a7950590b317f56124d572495beb4c0c8948a764
parent: 415940729df099709b9ffc8bfdd3eb5a52b2823d
author: Samuel Villareal <svkaiser@gmail.com>
date: Wed Sep 1 23:58:58 EDT 2010

+ Update to PIT_CheckThing

Subversion-branch: /branches/strife-branch
Subversion-revision: 1996

--- a/src/strife/p_map.c
+++ b/src/strife/p_map.c
@@ -313,13 +313,13 @@
     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 @@
     // 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