diff options
author | Holger Zickner <[email protected]> | 2004-07-08 15:58:48 +0000 |
---|---|---|
committer | Holger Zickner <[email protected]> | 2004-07-08 15:58:48 +0000 |
commit | 4f13ea26c4f47e54e66926f0700cf631e7bb3352 (patch) | |
tree | a9d434fc462417bb981b1565fd64cea5e7c82c15 /src/jake2/qcommon/PMove.java | |
parent | 76839da3568e20f51220584d1fc92841b216505a (diff) |
import of Jake2 version hannover
Diffstat (limited to 'src/jake2/qcommon/PMove.java')
-rw-r--r-- | src/jake2/qcommon/PMove.java | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/jake2/qcommon/PMove.java b/src/jake2/qcommon/PMove.java index ed82432..75459fc 100644 --- a/src/jake2/qcommon/PMove.java +++ b/src/jake2/qcommon/PMove.java @@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ // Created on 25.01.2004 by RST. -// $Id: PMove.java,v 1.1 2004-07-07 19:59:33 hzi Exp $ +// $Id: PMove.java,v 1.2 2004-07-08 15:58:46 hzi Exp $ package jake2.qcommon; @@ -160,8 +160,8 @@ public class PMove extends Game // save entity for contact if (pm.numtouch < MAXTOUCH && trace.ent != null) { - if (trace.ent.index != -1) - Com.p("touch: " + trace.ent.classname + " (" + trace.ent.index + ")" ); + //if (trace.ent.index != -1 && trace.ent.index != 0) + //Com.p("touch: " + trace.ent.classname + " (" + trace.ent.index + ")" ); pm.touchents[pm.numtouch] = trace.ent; pm.numtouch++; @@ -646,7 +646,6 @@ public class PMove extends Game else { pm.groundentity = trace.ent; - // hitting solid ground will end a waterjump if ((pm.s.pm_flags & PMF_TIME_WATERJUMP) != 0) { @@ -655,7 +654,7 @@ public class PMove extends Game } if (0 == (pm.s.pm_flags & PMF_ON_GROUND)) - { // just hit the ground + { // just hit the ground pm.s.pm_flags |= PMF_ON_GROUND; // don't do landing time if we were just going down a slope if (pml.velocity[2] < -200) |