r64 - trunk/src

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Fri Oct 1 17:56:11 EDT 2004


Author: jonas
Date: 2004-10-01 17:56:11 -0400 (Fri, 01 Oct 2004)
New Revision: 64

Modified:
   trunk/src/characters_common.cpp
Log:
makes more sense...

Modified: trunk/src/characters_common.cpp
===================================================================
--- trunk/src/characters_common.cpp	2004-10-01 21:38:24 UTC (rev 63)
+++ trunk/src/characters_common.cpp	2004-10-01 21:56:11 UTC (rev 64)
@@ -76,7 +76,7 @@
 void Character::idle(Uint16) {
     //check if we have ground below us...
     Hit hitobj;
-    hitobj=checkMove(pos);
+    hitobj=checkMove(pos,false,true);
 
     //are we falling?
     if ((!(hitobj.touch&DIR_DOWN)) || (gravity<0)) {
@@ -111,7 +111,7 @@
             addSpeed(Sint16(gravity*Dgrav/1000));
         }
         Hit hit=move(Dgrav);
-        if ((hit.enter&DIR_DOWN || hit.touch&DIR_DOWN) && (state&STATE_FALL)) crash(DIR_DOWN);
+        if ((hit.enter&DIR_DOWN) && (state&STATE_FALL)) crash(DIR_DOWN);
         Dgrav=0;
     }
 }




More information about the lostpenguins-commits mailing list