[Jake2-commits] jake2/src/jake2/game GameTargetAdapters.java,1.2,1.3 GameUtil.java,1.4,1.5 GameSave.

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	GameTargetAdapters.java GameUtil.java GameSave.java 
	GameBase.java GameSpawn.java 
Removed Files:
	game_export_t.java 
Log Message:
remove game_export_t and other dll related stuff

Index: GameTargetAdapters.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/game/GameTargetAdapters.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** GameTargetAdapters.java	27 Aug 2004 21:57:48 -0000	1.2
--- GameTargetAdapters.java	29 Aug 2004 21:39:24 -0000	1.3
***************
*** 24,32 ****
  package jake2.game;

! import jake2.*;
! import jake2.client.*;
! import jake2.qcommon.*;
! import jake2.render.*;
! import jake2.server.*;
  import jake2.util.Lib;
  import jake2.util.Math3D;
--- 24,29 ----
  package jake2.game;

! import jake2.Defines;
! import jake2.Globals;
  import jake2.util.Lib;
  import jake2.util.Math3D;
***************
*** 554,558 ****
  			}

! 			for (i = 1; i < GameBase.globals.num_edicts; i++) {
  				e = GameBase.g_edicts[i];

--- 551,555 ----
  			}

! 			for (i = 1; i < GameBase.num_edicts; i++) {
  				e = GameBase.g_edicts[i];

Index: GameSave.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/game/GameSave.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** GameSave.java	22 Aug 2004 14:25:12 -0000	1.3
--- GameSave.java	29 Aug 2004 21:39:24 -0000	1.4
***************
*** 24,38 ****
  package jake2.game;

! import java.io.FileNotFoundException;
! import java.io.IOException;
! import java.io.RandomAccessFile;
! import java.nio.*;
! 
! import jake2.*;
! import jake2.client.*;
! import jake2.qcommon.*;
! import jake2.render.*;
! import jake2.server.*;
! import jake2.util.*;

  public class GameSave extends GameFunc {
--- 24,29 ----
  package jake2.game;

! import jake2.qcommon.Com;
! import jake2.util.QuakeFile;

  public class GameSave extends GameFunc {
***************
*** 58,62 ****
  		for (int i= 0; i < game.maxentities; i++)
  			g_edicts[i]= new edict_t(i);
! 		SV_GAME.ge.edicts= g_edicts;
  	}

--- 49,53 ----
  		for (int i= 0; i < game.maxentities; i++)
  			g_edicts[i]= new edict_t(i);
! 		GameBase.g_edicts= g_edicts;
  	}

***************
*** 140,145 ****
  		CreateEdicts();

! 		globals.edicts= g_edicts;
! 		globals.max_edicts= game.maxentities;

  		// initialize all clients for this game
--- 131,136 ----
  		CreateEdicts();

! //		globals.edicts= g_edicts;
! //		globals.max_edicts= game.maxentities;

  		// initialize all clients for this game
***************
*** 148,152 ****
  		CreateClients();

! 		globals.num_edicts= game.maxclients + 1;
  	}

--- 139,143 ----
  		CreateClients();

! 		num_edicts= game.maxclients + 1;
  	}

***************
*** 222,226 ****
  	=================
  	*/
! 	static void WriteLevel(String filename) {
  		try {
  			int i;
--- 213,217 ----
  	=================
  	*/
! 	public static void WriteLevel(String filename) {
  		try {
  			int i;
***************
*** 236,240 ****

  			// write out all the entities
! 			for (i= 0; i < globals.num_edicts; i++) {
  				ent= g_edicts[i];
  				if (!ent.inuse)
--- 227,231 ----

  			// write out all the entities
! 			for (i= 0; i < num_edicts; i++) {
  				ent= g_edicts[i];
  				if (!ent.inuse)
***************
*** 271,275 ****
  	=================
  	*/
! 	static void ReadLevel(String filename) {
  		try {
  			edict_t ent;
--- 262,266 ----
  	=================
  	*/
! 	public static void ReadLevel(String filename) {
  		try {
  			edict_t ent;
***************
*** 283,287 ****
  			Game.CreateEdicts();

! 			globals.num_edicts= (int) maxclients.value + 1;

  			// load the level locals
--- 274,278 ----
  			Game.CreateEdicts();

! 			num_edicts= (int) maxclients.value + 1;

  			// load the level locals
***************
*** 294,299 ****
  					break;

! 				if (entnum >= globals.num_edicts)
! 					globals.num_edicts= entnum + 1;

  				ent= g_edicts[entnum];
--- 285,290 ----
  					break;

! 				if (entnum >= num_edicts)
! 					num_edicts= entnum + 1;

  				ent= g_edicts[entnum];
***************
*** 314,318 ****

  			// do any load time things at this point
! 			for (int i= 0; i < globals.num_edicts; i++) {
  				ent= g_edicts[i];

--- 305,309 ----

  			// do any load time things at this point
! 			for (int i= 0; i < num_edicts; i++) {
  				ent= g_edicts[i];

Index: GameUtil.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/game/GameUtil.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** GameUtil.java	20 Aug 2004 21:29:57 -0000	1.4
--- GameUtil.java	29 Aug 2004 21:39:24 -0000	1.5
***************
*** 24,33 ****
  package jake2.game;

- import java.sql.Savepoint;
- 
- import jake2.Defines;
  import jake2.client.M;
  import jake2.qcommon.Com;
! import jake2.util.*;

  public class GameUtil extends GameBase
--- 24,31 ----
  package jake2.game;

  import jake2.client.M;
  import jake2.qcommon.Com;
! import jake2.util.Lib;
! import jake2.util.Math3D;

  public class GameUtil extends GameBase
***************
*** 166,170 ****
  		edict_t e = null;

! 		for (i = (int) maxclients.value + 1; i < globals.num_edicts; i++)
  		{
  			e = g_edicts[i];
--- 164,168 ----
  		edict_t e = null;

! 		for (i = (int) maxclients.value + 1; i < num_edicts; i++)
  		{
  			e = g_edicts[i];
***************
*** 183,187 ****

  		e = g_edicts[i] = new edict_t(i);
! 		globals.num_edicts++;
  		G_InitEdict(e, i);
  		return e;
--- 181,185 ----

  		e = g_edicts[i] = new edict_t(i);
! 		num_edicts++;
  		G_InitEdict(e, i);
  		return e;

Index: GameSpawn.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/game/GameSpawn.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** GameSpawn.java	29 Aug 2004 19:27:37 -0000	1.5
--- GameSpawn.java	29 Aug 2004 21:39:24 -0000	1.6
***************
*** 285,289 ****
  		c = 0;
  		c2 = 0;
! 		for (i = 1; i < globals.num_edicts; i++) {
  			e = g_edicts[i];

--- 285,289 ----
  		c = 0;
  		c2 = 0;
! 		for (i = 1; i < num_edicts; i++) {
  			e = g_edicts[i];

***************
*** 299,303 ****
  			c2++;
  			//Com.Printf("Team:" + e.team+" entity: " + e.index + "\n");
! 			for (j = i + 1; j < globals.num_edicts; j++) {
  				e2 = g_edicts[j];
  				if (!e2.inuse)
--- 299,303 ----
  			c2++;
  			//Com.Printf("Team:" + e.team+" entity: " + e.index + "\n");
! 			for (j = i + 1; j < num_edicts; j++) {
  				e2 = g_edicts[j];
  				if (!e2.inuse)
***************
*** 329,333 ****
  	*/

! 		static void SpawnEntities(String mapname, String entities, String spawnpoint) {
  			edict_t ent;
  			int inhibit;
--- 329,333 ----
  	*/

! 		public static void SpawnEntities(String mapname, String entities, String spawnpoint) {
  			edict_t ent;
  			int inhibit;

Index: GameBase.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/game/GameBase.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** GameBase.java	22 Aug 2004 14:25:11 -0000	1.5
--- GameBase.java	29 Aug 2004 21:39:24 -0000	1.6
***************
*** 39,43 ****
  	public static level_locals_t level= new level_locals_t();
  	public static game_import_t gi= new game_import_t();
- 	public static game_export_t globals= new game_export_t();
  	public static spawn_temp_t st= new spawn_temp_t();

--- 39,42 ----
***************
*** 45,48 ****
--- 44,48 ----
  	public static int snd_fry;
  	public static int meansOfDeath;
+ 	public static int num_edicts;

  	public static edict_t g_edicts[]= new edict_t[MAX_EDICTS];
***************
*** 157,161 ****
  			from.i++;

! 		for (; from.i < globals.num_edicts; from.i++) {
  			from.o= g_edicts[from.i];
  			if (from.o.classname == null) {
--- 157,161 ----
  			from.i++;

! 		for (; from.i < num_edicts; from.i++) {
  			from.o= g_edicts[from.i];
  			if (from.o.classname == null) {
***************
*** 194,198 ****
  			from.i++;

! 		for (; from.i < globals.num_edicts; from.i++) {
  			from.o= g_edicts[from.i];
  			if (!from.o.inuse)
--- 194,198 ----
  			from.i++;

! 		for (; from.i < num_edicts; from.i++) {
  			from.o= g_edicts[from.i];
  			if (!from.o.inuse)
***************
*** 376,394 ****
  	*/
  	public static int DI_NODIR= -1;
- 	public static void assert1(boolean cond) {
- 		if (!cond) {
- 
- 			try {
- 
- 				int a[]= null;
- 				int b= a[0];
- 			}
- 			catch (Exception e) {
- 				System.err.println("assertion failed!");
- 				e.printStackTrace();
- 			}
- 
- 		}
- 	}

  	public static void ClearBounds(float[] mins, float[] maxs) {
--- 376,379 ----
***************
*** 428,434 ****
  	public static void ShutdownGame() {
  		gi.dprintf("==== ShutdownGame ====\n");
- 
- 		//gi.FreeTags (TAG_LEVEL);
- 		//gi.FreeTags (TAG_GAME);
  	}

--- 413,416 ----
***************
*** 655,659 ****
  		//

! 		for (i= 0; i < globals.num_edicts; i++) {
  			ent= g_edicts[i];
  			if (!ent.inuse)
--- 637,641 ----
  		//

! 		for (i= 0; i < num_edicts; i++) {
  			ent= g_edicts[i];
  			if (!ent.inuse)
***************
*** 699,703 ****
  	*/

! 	public static game_export_t GetGameApi(game_import_t imp) {
  		gi= imp;

--- 681,685 ----
  	*/

! 	public static void GetGameApi(game_import_t imp) {
  		gi= imp;

***************
*** 708,712 ****
  		};

! 		globals.apiversion= GAME_API_VERSION;
  		/*
  		globals.Init = InitGame;
--- 690,694 ----
  		};

! 		//globals.apiversion= GAME_API_VERSION;
  		/*
  		globals.Init = InitGame;
***************
*** 729,733 ****
  		*/

! 		return globals;
  	}
  }
\ No newline at end of file
--- 711,715 ----
  		*/

! 		//return globals;
  	}
  }
\ No newline at end of file

--- game_export_t.java DELETED ---

[Jake2-commits] jake2/src/jake2/game GameTargetAdapters.java,1.2,1.3 GameUtil.java,1.4,1.5 GameSave.

[Jake2-commits] jake2/src/jake2/game GameTargetAdapters.java,1.2,1.3 GameUtil.java,1.4,1.5 GameSave.java,1.3,1.4 GameBase.java,1.5,1.6 GameSpawn.java,1.5,1.6 game_export_t.java,1.5,NONE