[Jake2-commits] jake2/src/jake2/server SV.java,1.4,1.5 SV_INIT.java,1.4,1.5 SV_MAIN.java,1.4,1.5

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

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

Modified Files:
	SV.java SV_INIT.java SV_MAIN.java 
Log Message:
replace serverState and game_interface functions

Index: SV.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/server/SV.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** SV.java	26 Jul 2004 19:17:06 -0000	1.4
--- SV.java	30 Jul 2004 06:07:23 -0000	1.5
***************
*** 26,36 ****
  package jake2.server;
  
! import jake2.*;
  import jake2.game.*;
  import jake2.qcommon.Com;
! import jake2.util.*;
! import jake2.client.*;
! import jake2.game.*;
! import jake2.game.trace_t;
  
  /**
--- 26,35 ----
  package jake2.server;
  
! import jake2.Defines;
! import jake2.client.M;
  import jake2.game.*;
  import jake2.qcommon.Com;
! import jake2.util.Lib;
! import jake2.util.Math3D;
  
  /**
***************
*** 91,95 ****
  	
  		if (ent.think == null)
! 			GameBase.gi.error("NULL ent.think");
  	
  		ent.think.think(ent);
--- 90,94 ----
  	
  		if (ent.think == null)
! 			Com.Error(Defines.ERR_FATAL, "NULL ent.think");
  	
  		ent.think.think(ent);
***************
*** 487,491 ****
  		}
  		if (GameBase.pushed_p > Defines.MAX_EDICTS)
! 			GameBase.gi.error(Defines.ERR_FATAL, "pushed_p > &pushed[MAX_EDICTS], memory corrupted");
  	
  		if (part != null) {
--- 486,490 ----
  		}
  		if (GameBase.pushed_p > Defines.MAX_EDICTS)
! 			SV_GAME.PF_error(Defines.ERR_FATAL, "pushed_p > &pushed[MAX_EDICTS], memory corrupted");
  	
  		if (part != null) {

Index: SV_MAIN.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/server/SV_MAIN.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** SV_MAIN.java	23 Jul 2004 10:09:01 -0000	1.4
--- SV_MAIN.java	30 Jul 2004 06:07:23 -0000	1.5
***************
*** 1007,1013 ****
  		//memset (&sv, 0, sizeof(sv));
  		sv = new server_t();
- 
  		
! 		Com.SetServerState (sv.state);
  
  		// free server static data
--- 1007,1012 ----
  		//memset (&sv, 0, sizeof(sv));
  		sv = new server_t();
  		
! 		Globals.server_state= sv.state;
  
  		// free server static data

Index: SV_INIT.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/server/SV_INIT.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** SV_INIT.java	9 Jul 2004 06:50:49 -0000	1.4
--- SV_INIT.java	30 Jul 2004 06:07:23 -0000	1.5
***************
*** 24,37 ****
  package jake2.server;
  
! import java.io.IOException;
! import java.io.RandomAccessFile;
! 
! import jake2.*;
! import jake2.client.*;
  import jake2.game.*;
  import jake2.qcommon.*;
- import jake2.render.*;
  import jake2.sys.NET;
! import jake2.util.Lib;
  
  public class SV_INIT extends Globals  {
--- 24,36 ----
  package jake2.server;
  
! import jake2.Globals;
! import jake2.client.CL;
! import jake2.client.SCR;
  import jake2.game.*;
  import jake2.qcommon.*;
  import jake2.sys.NET;
! 
! import java.io.IOException;
! import java.io.RandomAccessFile;
  
  public class SV_INIT extends Globals  {
***************
*** 212,216 ****
  		sv.state = ss_dead;
  		
! 		Com.SetServerState(sv.state);
  
  		// wipe the entire per-level structure
--- 211,215 ----
  		sv.state = ss_dead;
  		
! 		Globals.server_state= sv.state;
  
  		// wipe the entire per-level structure
***************
*** 281,285 ****
  		// map initialization
  		sv.state = ss_loading;
! 		Com.SetServerState(sv.state);
  
  		// load and spawn all other entities
--- 280,284 ----
  		// map initialization
  		sv.state = ss_loading;
! 		Globals.server_state= sv.state;
  
  		// load and spawn all other entities
***************
*** 292,296 ****
  		// all precaches are complete
  		sv.state = serverstate;
! 		Com.SetServerState(sv.state);
  
  		// create a baseline for more efficient communications
--- 291,295 ----
  		// all precaches are complete
  		sv.state = serverstate;
! 		Globals.server_state= sv.state;
  
  		// create a baseline for more efficient communications