From b196d0fafd0399c14aefa7660c55f55a27d9d941 Mon Sep 17 00:00:00 2001
From: Holger Zickner <hoz@bytonic.de>
Date: Fri, 30 Jul 2004 06:07:23 +0000
Subject: replace serverState and game_interface functions

---
 src/jake2/server/SV.java      | 15 +++++++--------
 src/jake2/server/SV_INIT.java | 21 ++++++++++-----------
 src/jake2/server/SV_MAIN.java |  5 ++---
 3 files changed, 19 insertions(+), 22 deletions(-)

(limited to 'src/jake2')

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
diff --git a/src/jake2/server/SV_INIT.java b/src/jake2/server/SV_INIT.java
index 631e898..fd0823c 100644
--- a/src/jake2/server/SV_INIT.java
+++ b/src/jake2/server/SV_INIT.java
@@ -19,20 +19,19 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 // Created on 14.01.2004 by RST.
-// $Id: SV_INIT.java,v 1.4 2004-07-09 06:50:49 hzi Exp $
+// $Id: SV_INIT.java,v 1.5 2004-07-30 06:07:23 hzi Exp $
 
 package jake2.server;
 
-import java.io.IOException;
-import java.io.RandomAccessFile;
-
-import jake2.*;
-import jake2.client.*;
+import jake2.Globals;
+import jake2.client.CL;
+import jake2.client.SCR;
 import jake2.game.*;
 import jake2.qcommon.*;
-import jake2.render.*;
 import jake2.sys.NET;
-import jake2.util.Lib;
+
+import java.io.IOException;
+import java.io.RandomAccessFile;
 
 public class SV_INIT extends Globals  {
 
@@ -211,7 +210,7 @@ public class SV_INIT extends Globals  {
 		// restarted
 		sv.state = ss_dead;
 		
-		Com.SetServerState(sv.state);
+		Globals.server_state= sv.state;
 
 		// wipe the entire per-level structure
 		//memset(sv, 0, sizeof(sv));
@@ -280,7 +279,7 @@ public class SV_INIT extends Globals  {
 		// precache and static commands can be issued during
 		// map initialization
 		sv.state = ss_loading;
-		Com.SetServerState(sv.state);
+		Globals.server_state= sv.state;
 
 		// load and spawn all other entities
 		SV_GAME.ge.SpawnEntities(sv.name, CM.CM_EntityString(), spawnpoint);
@@ -291,7 +290,7 @@ public class SV_INIT extends Globals  {
 
 		// all precaches are complete
 		sv.state = serverstate;
-		Com.SetServerState(sv.state);
+		Globals.server_state= sv.state;
 
 		// create a baseline for more efficient communications
 		SV_CreateBaseline();
diff --git a/src/jake2/server/SV_MAIN.java b/src/jake2/server/SV_MAIN.java
index b3d5e9d..99b74e9 100644
--- a/src/jake2/server/SV_MAIN.java
+++ b/src/jake2/server/SV_MAIN.java
@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 // Created on 13.01.2004 by RST.
-// $Id: SV_MAIN.java,v 1.4 2004-07-23 10:09:01 hzi Exp $
+// $Id: SV_MAIN.java,v 1.5 2004-07-30 06:07:23 hzi Exp $
 
 package jake2.server;
 
@@ -1006,9 +1006,8 @@ public class SV_MAIN extends SV_GAME {
 
 		//memset (&sv, 0, sizeof(sv));
 		sv = new server_t();
-
 		
-		Com.SetServerState (sv.state);
+		Globals.server_state= sv.state;
 
 		// free server static data
 		//if (svs.clients!=null)
-- 
cgit v1.2.3