replace serverState functions

4 files changed, 13 insertions, 12 deletions

diff --git a/src/jake2/client/CL.java b/src/jake2/client/CL.java
index 125cedd..b1231f8 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.5 2004-07-09 06:50:50 hzi Exp $
+ * $Id: CL.java,v 1.6 2004-07-30 06:03:40 hzi Exp $
  */
 /*
 Copyright (C) 1997-2001 Id Software, Inc.
@@ -249,7 +249,7 @@ public final class CL extends CL_pred {
 		public void execute() {
 				// never pause in multiplayer
 
-	if (Cvar.VariableValue("maxclients") > 1 || Com.ServerState() == 0) {
+	if (Cvar.VariableValue("maxclients") > 1 || Globals.server_state == 0) {
 				Cvar.SetValue("paused", 0);
 				return;
 			}
@@ -312,7 +312,7 @@ public final class CL extends CL_pred {
 
 		// if the local server is running and we aren't
 		// then connect
-		if (cls.state == ca_disconnected && Com.ServerState() != 0) {
+		if (cls.state == ca_disconnected && Globals.server_state != 0) {
 			cls.state = ca_connecting;
 			cls.servername = "localhost";
 			// we don't need a challenge on the localhost
@@ -358,7 +358,7 @@ public final class CL extends CL_pred {
 				return;
 			}
 		
-			if (Com.ServerState() != 0) {
+			if (Globals.server_state != 0) {
 				// if running a local server, kill it and reissue
 				SV_MAIN.SV_Shutdown("Server quit\n", false);
 			} else {
diff --git a/src/jake2/client/CL_parse.java b/src/jake2/client/CL_parse.java
index 130e89f..432df25 100644
--- a/src/jake2/client/CL_parse.java
+++ b/src/jake2/client/CL_parse.java
@@ -2,7 +2,7 @@
  * CL_parse.java
  * Copyright (C) 2004
  * 
- * $Id: CL_parse.java,v 1.7 2004-07-23 22:38:51 hzi Exp $
+ * $Id: CL_parse.java,v 1.8 2004-07-30 06:03:40 hzi Exp $
  */
 /*
 Copyright (C) 1997-2001 Id Software, Inc.
@@ -26,6 +26,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 package jake2.client;
 
 import jake2.Defines;
+import jake2.Globals;
 import jake2.game.Cmd;
 import jake2.game.entity_state_t;
 import jake2.qcommon.*;
@@ -315,7 +316,7 @@ public class CL_parse extends CL_view {
 		cls.serverProtocol = i;
 
 		// BIG HACK to let demos from release work with the 3.0x patch!!!
-		if (Com.ServerState() != 0 && PROTOCOL_VERSION == 34) {
+		if (Globals.server_state != 0 && PROTOCOL_VERSION == 34) {
 		}
 		else if (i != PROTOCOL_VERSION)
 			Com.Error(ERR_DROP, "Server returned version " + i + ", not " + PROTOCOL_VERSION);
diff --git a/src/jake2/client/Console.java b/src/jake2/client/Console.java
index 4010eaf..b37a1f8 100644
--- a/src/jake2/client/Console.java
+++ b/src/jake2/client/Console.java
@@ -2,7 +2,7 @@
  * Con.java
  * Copyright (C) 2003
  * 
- * $Id: Console.java,v 1.3 2004-07-19 19:20:22 hzi Exp $
+ * $Id: Console.java,v 1.4 2004-07-30 06:03:40 hzi Exp $
  */
 /*
 Copyright (C) 1997-2001 Id Software, Inc.
@@ -66,7 +66,7 @@ public final class Console extends Globals {
 				Menu.ForceMenuOff();
 				Globals.cls.key_dest = Defines.key_console;     
 
-				if (Cvar.VariableValue("maxclients") == 1 && Com.ServerState()!= 0)
+				if (Cvar.VariableValue("maxclients") == 1 && Globals.server_state!= 0)
 					Cvar.Set("paused", "1");
 			}
 		}
diff --git a/src/jake2/client/Menu.java b/src/jake2/client/Menu.java
index c6c7606..6e451b9 100644
--- a/src/jake2/client/Menu.java
+++ b/src/jake2/client/Menu.java
@@ -2,7 +2,7 @@
  * Menu.java
  * Copyright (C) 2004
  * 
- * $Id: Menu.java,v 1.5 2004-07-23 10:02:49 hzi Exp $
+ * $Id: Menu.java,v 1.6 2004-07-30 06:03:40 hzi Exp $
  */
 /*
 Copyright (C) 1997-2001 Id Software, Inc.
@@ -158,7 +158,7 @@ public final class Menu extends Key {
 	static void PushMenu(xcommand_t draw, keyfunc_t key) { //, String(*key) (int k) ) {
 		int i;
 
-		if (Cvar.VariableValue("maxclients") == 1 && Com.ServerState() != 0)
+		if (Cvar.VariableValue("maxclients") == 1 && Globals.server_state != 0)
 			Cvar.Set("paused", "1");
 
 		// if this menu is already present, drop back to that level
@@ -2475,7 +2475,7 @@ public final class Menu extends Key {
 		}
 	};
 	static void Menu_SaveGame_f() {
-		if (0 == Com.ServerState())
+		if (0 == Globals.server_state)
 			return; // not playing a game
 
 		SaveGame_MenuInit();
@@ -2800,7 +2800,7 @@ public final class Menu extends Key {
 		}
 
 		if (spot != null) {
-			if (Com.ServerState() != 0)
+			if (Globals.server_state != 0)
 				Cbuf.AddText("disconnect\n");
 			Cbuf.AddText("gamemap \"*" + startmap + "$" + spot + "\"\n");
 		}