summaryrefslogtreecommitdiffstats
path: root/src/jake2/server/SV.java
diff options
context:
space:
mode:
authorHolger Zickner <[email protected]>2004-07-30 06:07:23 +0000
committerHolger Zickner <[email protected]>2004-07-30 06:07:23 +0000
commitb196d0fafd0399c14aefa7660c55f55a27d9d941 (patch)
treec746be5cc171755a04b857789eaa6c7d53f613bd /src/jake2/server/SV.java
parent0681b364734d9f4d6b08e89e41850e0d36891c02 (diff)
replace serverState and game_interface functions
Diffstat (limited to 'src/jake2/server/SV.java')
-rw-r--r--src/jake2/server/SV.java15
1 files changed, 7 insertions, 8 deletions
diff --git a/src/jake2/server/SV.java b/src/jake2/server/SV.java
index be38f1c..4792264 100644
--- a/src/jake2/server/SV.java
+++ b/src/jake2/server/SV.java
@@ -2,7 +2,7 @@
* SV.java
* Copyright (C) 2003
*
- * $Id: SV.java,v 1.4 2004-07-26 19:17:06 hzi Exp $
+ * $Id: SV.java,v 1.5 2004-07-30 06:07:23 hzi Exp $
*/
/*
Copyright (C) 1997-2001 Id Software, Inc.
@@ -25,13 +25,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
package jake2.server;
-import jake2.*;
+import jake2.Defines;
+import jake2.client.M;
import jake2.game.*;
import jake2.qcommon.Com;
-import jake2.util.*;
-import jake2.client.*;
-import jake2.game.*;
-import jake2.game.trace_t;
+import jake2.util.Lib;
+import jake2.util.Math3D;
/**
* SV
@@ -90,7 +89,7 @@ public final class SV {
ent.nextthink = 0;
if (ent.think == null)
- GameBase.gi.error("NULL ent.think");
+ Com.Error(Defines.ERR_FATAL, "NULL ent.think");
ent.think.think(ent);
@@ -486,7 +485,7 @@ public final class SV {
}
}
if (GameBase.pushed_p > Defines.MAX_EDICTS)
- GameBase.gi.error(Defines.ERR_FATAL, "pushed_p > &pushed[MAX_EDICTS], memory corrupted");
+ SV_GAME.PF_error(Defines.ERR_FATAL, "pushed_p > &pushed[MAX_EDICTS], memory corrupted");
if (part != null) {
// the move failed, bump all nextthink times and back out moves