diff options
Diffstat (limited to 'src/jake2')
| -rw-r--r-- | src/jake2/client/CL.java | 4 | ||||
| -rw-r--r-- | src/jake2/game/GameSave.java | 4 | ||||
| -rw-r--r-- | src/jake2/game/GameSpawn.java | 45 | ||||
| -rw-r--r-- | src/jake2/game/edict_t.java | 5 | ||||
| -rw-r--r-- | src/jake2/game/game_locals_t.java | 4 | ||||
| -rw-r--r-- | src/jake2/server/SV_CCMDS.java | 4 | ||||
| -rw-r--r-- | src/jake2/util/QuakeFile.java | 10 |
7 files changed, 14 insertions, 62 deletions
diff --git a/src/jake2/client/CL.java b/src/jake2/client/CL.java index 2cb6128..0d5bb26 100644 --- a/src/jake2/client/CL.java +++ b/src/jake2/client/CL.java @@ -2,7 +2,7 @@ * CL.java * Copyright (C) 2004 * - * $Id: CL.java,v 1.8 2004-08-27 21:05:04 hzi Exp $ + * $Id: CL.java,v 1.9 2004-09-04 19:08:29 salomo Exp $ */ /* Copyright (C) 1997-2001 Id Software, Inc. @@ -974,7 +974,7 @@ public final class CL extends CL_pred { int num_skins = pheader.num_skins; while (precache_model_skin - 1 < num_skins) { - Com.Printf("critical code section because of endian mess!"); + //Com.Printf("critical code section because of endian mess!\n"); String name = new String( diff --git a/src/jake2/game/GameSave.java b/src/jake2/game/GameSave.java index 90d9619..b89ac21 100644 --- a/src/jake2/game/GameSave.java +++ b/src/jake2/game/GameSave.java @@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ // Created on 29.12.2003 by RST. -// $Id: GameSave.java,v 1.4 2004-08-29 21:39:24 hzi Exp $ +// $Id: GameSave.java,v 1.5 2004-09-04 19:08:30 salomo Exp $ package jake2.game; @@ -188,7 +188,6 @@ public class GameSave extends GameFunc { try { f= new QuakeFile(filename, "r"); - Com.Printf("loading game:" + filename); CreateEdicts(); game.load(f); @@ -288,7 +287,6 @@ public class GameSave extends GameFunc { num_edicts= entnum + 1; ent= g_edicts[entnum]; - System.out.println("readint ent" + entnum); ent.read(f); ent.cleararealinks(); gi.linkentity(ent); diff --git a/src/jake2/game/GameSpawn.java b/src/jake2/game/GameSpawn.java index c93ebc0..233cbff 100644 --- a/src/jake2/game/GameSpawn.java +++ b/src/jake2/game/GameSpawn.java @@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ // Created on 18.11.2003 by RST. -// $Id: GameSpawn.java,v 1.6 2004-08-29 21:39:24 hzi Exp $ +// $Id: GameSpawn.java,v 1.7 2004-09-04 19:08:30 salomo Exp $ package jake2.game; @@ -166,49 +166,6 @@ public class GameSpawn extends GameSave { if (!ent.set(key, value)) gi.dprintf("??? The key [" + key + "] is not a field\n"); - - - /** OLD CODE, delegated to ent.set(...) and st.set(...) - - for (f = fields; f.name; f++) { - if (!(f.flags & FFL_NOSPAWN) && !Q_stricmp(f.name, key)) { - // found it - if (f.flags & FFL_SPAWNTEMP) - b = (byte *) & st; - else - b = (byte *) ent; - - switch (f.type) { - case F_LSTRING : - * (String *) (b + f.ofs) = ED_NewString(value); - break; - case F_VECTOR : - sscanf(value, "%f %f %f", & vec[0], & vec[1], & vec[2]); - ((float *) (b + f.ofs))[0] = vec[0]; - ((float *) (b + f.ofs))[1] = vec[1]; - ((float *) (b + f.ofs))[2] = vec[2]; - break; - case F_INT : - * (int *) (b + f.ofs) = atoi(value); - break; - case F_FLOAT : - * (float *) (b + f.ofs) = atof(value); - break; - case F_ANGLEHACK : - v = atof(value); - ((float *) (b + f.ofs))[0] = 0; - ((float *) (b + f.ofs))[1] = v; - ((float *) (b + f.ofs))[2] = 0; - break; - case F_IGNORE : - break; - } - return; - } - } - gi.dprintf("%s is not a field\n", key); - - */ } /* diff --git a/src/jake2/game/edict_t.java b/src/jake2/game/edict_t.java index ef2e4a6..0de35df 100644 --- a/src/jake2/game/edict_t.java +++ b/src/jake2/game/edict_t.java @@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ // Created on 04.11.2003 by RST. -// $Id: edict_t.java,v 1.4 2004-08-22 14:25:12 salomo Exp $ +// $Id: edict_t.java,v 1.5 2004-09-04 19:08:30 salomo Exp $ package jake2.game; @@ -664,8 +664,7 @@ public class edict_t { oldenemy= f.readEdictRef(); activator= f.readEdictRef(); groundentity= f.readEdictRef(); - if (index == 145) - System.out.println("loadground:" + groundentity); + groundentity_linkcount= f.readInt(); teamchain= f.readEdictRef(); teammaster= f.readEdictRef(); diff --git a/src/jake2/game/game_locals_t.java b/src/jake2/game/game_locals_t.java index cbc109f..cf9718a 100644 --- a/src/jake2/game/game_locals_t.java +++ b/src/jake2/game/game_locals_t.java @@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ // Created on 31.10.2003 by RST. -// $Id: game_locals_t.java,v 1.4 2004-08-20 21:29:58 salomo Exp $ +// $Id: game_locals_t.java,v 1.5 2004-09-04 19:08:29 salomo Exp $ package jake2.game; @@ -83,7 +83,7 @@ public class game_locals_t extends Defines // rst's checker :-) if (f.readInt()!=1928) - System.err.println("error in loading game_locals."); + Com.DPrintf("error in loading game_locals, 1928\n"); } diff --git a/src/jake2/server/SV_CCMDS.java b/src/jake2/server/SV_CCMDS.java index 8398cd5..2c97f31 100644 --- a/src/jake2/server/SV_CCMDS.java +++ b/src/jake2/server/SV_CCMDS.java @@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ // Created on 18.01.2004 by RST. -// $Id: SV_CCMDS.java,v 1.9 2004-09-04 09:01:01 salomo Exp $ +// $Id: SV_CCMDS.java,v 1.10 2004-09-04 19:08:30 salomo Exp $ package jake2.server; @@ -385,7 +385,6 @@ public class SV_CCMDS extends SV_ENTS { name= FS.Gamedir() + "/save/current/" + sv.name + ".sav"; GameSave.ReadLevel(name); - System.out.println("all done!"); } /* @@ -510,7 +509,6 @@ public class SV_CCMDS extends SV_ENTS { } catch (Exception e) { Com.Printf("Couldn't read file " + name + "\n"); - System.err.println(e); e.printStackTrace(); } } diff --git a/src/jake2/util/QuakeFile.java b/src/jake2/util/QuakeFile.java index 9b71bb2..969248c 100644 --- a/src/jake2/util/QuakeFile.java +++ b/src/jake2/util/QuakeFile.java @@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ // Created on 24.07.2004 by RST. -// $Id: QuakeFile.java,v 1.1 2004-08-20 21:29:57 salomo Exp $ +// $Id: QuakeFile.java,v 1.2 2004-09-04 19:08:30 salomo Exp $ package jake2.util; @@ -27,6 +27,7 @@ import jake2.game.Game; import jake2.game.SuperAdapter; import jake2.game.edict_t; import jake2.game.gitem_t; +import jake2.qcommon.Com; import java.io.*; @@ -115,7 +116,7 @@ public class QuakeFile extends RandomAccessFile if (i > Game.g_edicts.length) { - System.err.println("jake2: illegal edict num:" + i); + Com.DPrintf("jake2: illegal edict num:" + i + "\n"); return null; } @@ -134,9 +135,8 @@ public class QuakeFile extends RandomAccessFile String str= a.getID(); if (a == null) { - System.err.println("writeAdapter: invalid Adapter id for" + a); + Com.DPrintf("writeAdapter: invalid Adapter id for " + a + "\n"); } - System.out.println("writing adapter:" + str); writeString(str); } } @@ -145,7 +145,7 @@ public class QuakeFile extends RandomAccessFile public SuperAdapter readAdapter() throws IOException { if (readInt() != 3988) - System.err.println("wrong read position: readadapter."); + Com.DPrintf("wrong read position: readadapter 3988 \n"); String id= readString(); |