[Jake2-commits] jake2/src/jake2/game client_respawn_t.java,1.3,1.4 game_locals_t.java,1.2,1.3 trace_t.java,1.3,1.4 client_persistant_t.java,1.3,1.4

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

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

Modified Files:
	client_respawn_t.java game_locals_t.java trace_t.java 
	client_persistant_t.java 
Log Message:
cleanups

Index: trace_t.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/game/trace_t.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** trace_t.java	8 Jul 2004 20:24:29 -0000	1.3
--- trace_t.java	12 Jul 2004 20:47:01 -0000	1.4
***************
*** 24,28 ****
  package jake2.game;
  
! import jake2.util.Lib;
  
  //a trace is returned when a box is swept through the world
--- 24,28 ----
  package jake2.game;
  
! import jake2.util.Math3D;
  
  //a trace is returned when a box is swept through the world
***************
*** 45,49 ****
  		startsolid = from.allsolid;
  		fraction = from.fraction;
! 		endpos = Lib.clone(from.endpos);
  		plane.set(from.plane);
  		surface = from.surface;
--- 45,49 ----
  		startsolid = from.allsolid;
  		fraction = from.fraction;
! 		Math3D.VectorCopy(from.endpos, endpos);
  		plane.set(from.plane);
  		surface = from.surface;
***************
*** 51,66 ****
  		ent = from.ent;
  	}
- 	
- 	// =============
- //	public trace_t getClone() {
- //		trace_t out = null;
- //		try {
- //			out = (trace_t) this.clone();
- //			out.plane = plane.getClone();
- //			out.endpos = Lib.clone(endpos);
- //		}
- //		catch (CloneNotSupportedException e) {
- //		}
- //		return out;
- //	}
  }
--- 51,53 ----

Index: game_locals_t.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/game/game_locals_t.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** game_locals_t.java	8 Jul 2004 15:58:44 -0000	1.2
--- game_locals_t.java	12 Jul 2004 20:47:01 -0000	1.3
***************
*** 28,32 ****
  import jake2.util.Lib;
  
- import java.io.IOException;
  import java.nio.ByteBuffer;
  
--- 28,31 ----
***************
*** 61,65 ****
  	public boolean autosaved;
  
! 	public void load(ByteBuffer bb) throws IOException
  	{
  		String date = Lib.readString(bb, 16);
--- 60,64 ----
  	public boolean autosaved;
  
! 	public void load(ByteBuffer bb)
  	{
  		String date = Lib.readString(bb, 16);

Index: client_respawn_t.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/game/client_respawn_t.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** client_respawn_t.java	8 Jul 2004 20:24:29 -0000	1.3
--- client_respawn_t.java	12 Jul 2004 20:47:01 -0000	1.4
***************
*** 25,28 ****
--- 25,29 ----
  import jake2.qcommon.Com;
  import jake2.util.Lib;
+ import jake2.util.Math3D;
  
  import java.io.IOException;
***************
*** 43,47 ****
  		enterframe = from.enterframe;
  		score = from.score;
! 		cmd_angles = Lib.clone(from.cmd_angles);
  		spectator = from.spectator;
  	}
--- 44,48 ----
  		enterframe = from.enterframe;
  		score = from.score;
! 		Math3D.VectorCopy(from.cmd_angles, cmd_angles);
  		spectator = from.spectator;
  	}
***************
*** 53,57 ****
  		enterframe = 0;
  		score = 0;
! 		cmd_angles = new float[3];
  		spectator = false;
  	}
--- 54,58 ----
  		enterframe = 0;
  		score = 0;
! 		Math3D.VectorClear(cmd_angles);
  		spectator = false;
  	}

Index: client_persistant_t.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/game/client_persistant_t.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** client_persistant_t.java	8 Jul 2004 20:24:29 -0000	1.3
--- client_persistant_t.java	12 Jul 2004 20:47:01 -0000	1.4
***************
*** 27,43 ****
  import jake2.util.Lib;
  
- import java.io.IOException;
  import java.nio.ByteBuffer;
  
! public class client_persistant_t implements Cloneable {
! 
! //	public client_persistant_t getClone() {
! //		try {
! //			return (client_persistant_t) this.clone();
! //		}
! //		catch (CloneNotSupportedException e) {
! //			return null;
! //		}
! //	}
  	
  	public void set(client_persistant_t from)
--- 27,33 ----
  import jake2.util.Lib;
  
  import java.nio.ByteBuffer;
  
! public class client_persistant_t {
  	
  	public void set(client_persistant_t from)
***************
*** 52,56 ****
  		selected_item = from.selected_item;
  		System.arraycopy(from.inventory, 0, inventory, 0, inventory.length);
- 		//inventory = Lib.clone(from.inventory);
  		max_bullets = from.max_bullets;
  		max_shells = from.max_shells;
--- 42,45 ----
***************
*** 101,105 ****
  	boolean spectator; // client is a spectator
  
! 	public void load(ByteBuffer bb) throws IOException {
  		// client persistant_t
  
--- 90,94 ----
  	boolean spectator; // client is a spectator
  
! 	public void load(ByteBuffer bb) {
  		// client persistant_t