major refactoring in game, server and client package

1 files changed, 97 insertions, 72 deletions

diff --git a/src/jake2/game/pmove_t.java b/src/jake2/game/pmove_t.java
index d4138f4..7156e2a 100644
--- a/src/jake2/game/pmove_t.java
+++ b/src/jake2/game/pmove_t.java
@@ -1,83 +1,108 @@
 /*
-Copyright (C) 1997-2001 Id Software, Inc.
+ * Copyright (C) 1997-2001 Id Software, Inc.
+ * 
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option) any later
+ * version.
+ * 
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.
+ * 
+ * See the GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+ * Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  
+ */
 
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
+// Created on 31.10.2003 by RST.
+// $Id: pmove_t.java,v 1.2 2004-09-22 19:22:04 salomo Exp $
+package jake2.game;
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+import jake2.*;
+import jake2.server.SV_WORLD;
 
-See the GNU General Public License for more details.
+public class pmove_t {
 
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+    public static class TraceAdapter {
+        // callbacks to test the world
+        public trace_t trace(float[] start, float[] mins, float[] maxs,
+                float[] end) {
+            return null;
+        }
+    }
 
-*/
+    public static class PointContentsAdapter {
+        // callbacks to test the world
+        public int pointcontents(float[] point) {
+            return 0;
+        }
+    }
 
-// Created on 31.10.2003 by RST.
-// $Id: pmove_t.java,v 1.1 2004-07-07 19:59:26 hzi Exp $
+    // state (in / out)
+    public pmove_state_t s = new pmove_state_t();
 
-package jake2.game;
+    // command (in)
+    public usercmd_t cmd = new usercmd_t();
 
-import jake2.*;
-import jake2.server.SV_WORLD;
+    public boolean snapinitial; // if s has been changed outside pmove
 
-public class pmove_t {
+    // results (out)
+    public int numtouch;
+
+    public edict_t touchents[] = new edict_t[Defines.MAXTOUCH];
+
+    public float[] viewangles = { 0, 0, 0 }; // clamped
+
+    public float viewheight;
+
+    public float[] mins = { 0, 0, 0 }, maxs = { 0, 0, 0 }; // bounding box size
+
+    public edict_t groundentity;
+
+    public int watertype;
+
+    public int waterlevel;
+
+    public TraceAdapter trace;
+
+    public PointContentsAdapter pointcontents;
+
+    // pmove->pm_flags
+    public final static int PMF_DUCKED = 1;
+
+    public final static int PMF_JUMP_HELD = 2;
+
+    public final static int PMF_ON_GROUND = 4;
+
+    public final static int PMF_TIME_WATERJUMP = 8; // pm_time is waterjump
+
+    public final static int PMF_TIME_LAND = 16; // pm_time is time before rejump
+
+    public final static int PMF_TIME_TELEPORT = 32; // pm_time is non-moving
+                                                    // time
+
+    public final static int PMF_NO_PREDICTION = 64; // temporarily disables
+                                                    // prediction (used for
+                                                    // grappling hook)
+
+    public void clear() {
 
-	public static class TraceAdapter {
-		// callbacks to test the world
-		public trace_t trace(float[] start, float[] mins, float[] maxs, float[] end) {
-			return null;
-		}
-	}
-
-	public static class PointContentsAdapter {
-		// callbacks to test the world
-		public int pointcontents(float[] point) {
-			return 0;
-		}
-	}
-
-	// state (in / out)
-	public pmove_state_t s = new pmove_state_t();
-
-	// command (in)
-	public usercmd_t cmd = new usercmd_t();
-	public boolean snapinitial; // if s has been changed outside pmove
-
-	// results (out)
-	public int numtouch;
-	public edict_t touchents[] = new edict_t[Defines.MAXTOUCH];
-
-	public float[] viewangles = { 0, 0, 0 }; // clamped
-	public float   viewheight;
-
-	public float[] mins = { 0, 0, 0 }, maxs = { 0, 0, 0 }; // bounding box size
-
-	public edict_t groundentity;
-	public int watertype;
-	public int waterlevel;
-
-	public TraceAdapter trace;
-	public PointContentsAdapter pointcontents;	
-
-	public void clear() {
-		groundentity = null;
-		waterlevel = watertype =0;
-		trace = null;
-		pointcontents = null;
-		mins = new float [3];
-		maxs = new float [3];
-		viewheight=0;
-		viewangles = new float [3];
-		touchents = new edict_t[Defines.MAXTOUCH];
-		numtouch =0;
-		snapinitial=false;
-		cmd = new usercmd_t();
-		s = new pmove_state_t();
-	}
-}
+        groundentity = null;
+        waterlevel = watertype = 0;
+        trace = null;
+        pointcontents = null;
+        mins = new float[3];
+        maxs = new float[3];
+        viewheight = 0;
+        viewangles = new float[3];
+        touchents = new edict_t[Defines.MAXTOUCH];
+        numtouch = 0;
+        snapinitial = false;
+        cmd = new usercmd_t();
+        s = new pmove_state_t();
+    }
+}
\ No newline at end of file