[Jake2-commits] jake2/src/jake2/client CL.java,1.5,1.6 CL_parse.java,1.7,1.8 Menu.java,1.5,1.6 Console.java,1.3,1.4

[Holger Z. <hz...@us...>]

Update of /cvsroot/jake2/jake2/src/jake2/client
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6298/src/jake2/client

Modified Files:
	CL.java CL_parse.java Menu.java Console.java 
Log Message:
replace serverState functions

Index: Menu.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/client/Menu.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Menu.java	23 Jul 2004 10:02:49 -0000	1.5
--- Menu.java	30 Jul 2004 06:03:40 -0000	1.6
***************
*** 159,163 ****
  		int i;
  
! 		if (Cvar.VariableValue("maxclients") == 1 && Com.ServerState() != 0)
  			Cvar.Set("paused", "1");
  
--- 159,163 ----
  		int i;
  
! 		if (Cvar.VariableValue("maxclients") == 1 && Globals.server_state != 0)
  			Cvar.Set("paused", "1");
  
***************
*** 2476,2480 ****
  	};
  	static void Menu_SaveGame_f() {
! 		if (0 == Com.ServerState())
  			return; // not playing a game
  
--- 2476,2480 ----
  	};
  	static void Menu_SaveGame_f() {
! 		if (0 == Globals.server_state)
  			return; // not playing a game
  
***************
*** 2801,2805 ****
  
  		if (spot != null) {
! 			if (Com.ServerState() != 0)
  				Cbuf.AddText("disconnect\n");
  			Cbuf.AddText("gamemap \"*" + startmap + "$" + spot + "\"\n");
--- 2801,2805 ----
  
  		if (spot != null) {
! 			if (Globals.server_state != 0)
  				Cbuf.AddText("disconnect\n");
  			Cbuf.AddText("gamemap \"*" + startmap + "$" + spot + "\"\n");

Index: Console.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/client/Console.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Console.java	19 Jul 2004 19:20:22 -0000	1.3
--- Console.java	30 Jul 2004 06:03:40 -0000	1.4
***************
*** 67,71 ****
  				Globals.cls.key_dest = Defines.key_console;     
  
! 				if (Cvar.VariableValue("maxclients") == 1 && Com.ServerState()!= 0)
  					Cvar.Set("paused", "1");
  			}
--- 67,71 ----
  				Globals.cls.key_dest = Defines.key_console;     
  
! 				if (Cvar.VariableValue("maxclients") == 1 && Globals.server_state!= 0)
  					Cvar.Set("paused", "1");
  			}

Index: CL_parse.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/client/CL_parse.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** CL_parse.java	23 Jul 2004 22:38:51 -0000	1.7
--- CL_parse.java	30 Jul 2004 06:03:40 -0000	1.8
***************
*** 27,30 ****
--- 27,31 ----
  
  import jake2.Defines;
+ import jake2.Globals;
  import jake2.game.Cmd;
  import jake2.game.entity_state_t;
***************
*** 316,320 ****
  
  		// BIG HACK to let demos from release work with the 3.0x patch!!!
! 		if (Com.ServerState() != 0 && PROTOCOL_VERSION == 34) {
  		}
  		else if (i != PROTOCOL_VERSION)
--- 317,321 ----
  
  		// BIG HACK to let demos from release work with the 3.0x patch!!!
! 		if (Globals.server_state != 0 && PROTOCOL_VERSION == 34) {
  		}
  		else if (i != PROTOCOL_VERSION)

Index: CL.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/client/CL.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** CL.java	9 Jul 2004 06:50:50 -0000	1.5
--- CL.java	30 Jul 2004 06:03:40 -0000	1.6
***************
*** 250,254 ****
  				// never pause in multiplayer
  
! 	if (Cvar.VariableValue("maxclients") > 1 || Com.ServerState() == 0) {
  				Cvar.SetValue("paused", 0);
  				return;
--- 250,254 ----
  				// never pause in multiplayer
  
! 	if (Cvar.VariableValue("maxclients") > 1 || Globals.server_state == 0) {
  				Cvar.SetValue("paused", 0);
  				return;
***************
*** 313,317 ****
  		// if the local server is running and we aren't
  		// then connect
! 		if (cls.state == ca_disconnected && Com.ServerState() != 0) {
  			cls.state = ca_connecting;
  			cls.servername = "localhost";
--- 313,317 ----
  		// if the local server is running and we aren't
  		// then connect
! 		if (cls.state == ca_disconnected && Globals.server_state != 0) {
  			cls.state = ca_connecting;
  			cls.servername = "localhost";
***************
*** 359,363 ****
  			}
  		
! 			if (Com.ServerState() != 0) {
  				// if running a local server, kill it and reissue
  				SV_MAIN.SV_Shutdown("Server quit\n", false);
--- 359,363 ----
  			}
  		
! 			if (Globals.server_state != 0) {
  				// if running a local server, kill it and reissue
  				SV_MAIN.SV_Shutdown("Server quit\n", false);