[Jake2-commits] jake2/src/jake2/qcommon CM.java,1.3,1.4 Netchan.java,1.2,1.3 Cbuf.java,1.2,1.3

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

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

Modified Files:
	CM.java Netchan.java Cbuf.java 
Log Message:
cleanups

Index: Cbuf.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/qcommon/Cbuf.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Cbuf.java	8 Jul 2004 15:58:46 -0000	1.2
--- Cbuf.java	12 Jul 2004 20:47:00 -0000	1.3
***************
*** 29,33 ****
  import jake2.Globals;
  import jake2.game.Cmd;
- import jake2.util.Lib;
  
  /**
--- 29,32 ----
***************
*** 230,234 ****
  	*/
  	public static void CopyToDefer() {
! 		Lib.memcpy(Globals.defer_text_buf, Globals.cmd_text_buf, Globals.cmd_text.cursize);
  		Globals.defer_text_buf[Globals.cmd_text.cursize] = 0;
  		Globals.cmd_text.cursize = 0;
--- 229,233 ----
  	*/
  	public static void CopyToDefer() {
! 		System.arraycopy(Globals.cmd_text_buf, 0, Globals.defer_text_buf, 0, Globals.cmd_text.cursize);
  		Globals.defer_text_buf[Globals.cmd_text.cursize] = 0;
  		Globals.cmd_text.cursize = 0;

Index: Netchan.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/qcommon/Netchan.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Netchan.java	8 Jul 2004 15:58:46 -0000	1.2
--- Netchan.java	12 Jul 2004 20:47:00 -0000	1.3
***************
*** 26,38 ****
  package jake2.qcommon;
  
! import sun.applet.resources.MsgAppletViewer;
! import jake2.*;
! import jake2.client.*;
! import jake2.game.*;
! import jake2.render.*;
! import jake2.server.*;
  import jake2.sys.NET;
  import jake2.sys.Sys;
- import jake2.util.Lib;
  
  /**
--- 26,35 ----
  package jake2.qcommon;
  
! import jake2.Defines;
! import jake2.Globals;
! import jake2.game.cvar_t;
! import jake2.server.SV_MAIN;
  import jake2.sys.NET;
  import jake2.sys.Sys;
  
  /**
***************
*** 225,229 ****
  
  		if (chan.reliable_length == 0 && chan.message.cursize != 0) {
! 			Lib.memcpy(chan.reliable_buf, chan.message_buf, chan.message.cursize);
  			chan.reliable_length = chan.message.cursize;
  			chan.message.cursize = 0;
--- 222,226 ----
  
  		if (chan.reliable_length == 0 && chan.message.cursize != 0) {
! 			System.arraycopy(chan.message_buf, 0, chan.reliable_buf, 0, chan.message.cursize);
  			chan.reliable_length = chan.message.cursize;
  			chan.message.cursize = 0;

Index: CM.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/qcommon/CM.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CM.java	9 Jul 2004 06:50:50 -0000	1.3
--- CM.java	12 Jul 2004 20:47:00 -0000	1.4
***************
*** 1704,1708 ****
  	public static byte[] CM_ClusterPVS(int cluster) {
  		if (cluster == -1)
! 			Lib.memset(pvsrow, (byte) 0, (numclusters + 7) >> 3);
  		else
  			CM_DecompressVis(map_visibility, map_vis.bitofs[cluster][DVIS_PVS], pvsrow);
--- 1704,1708 ----
  	public static byte[] CM_ClusterPVS(int cluster) {
  		if (cluster == -1)
! 			Arrays.fill(pvsrow, 0, (numclusters + 7) >> 3, (byte)0);
  		else
  			CM_DecompressVis(map_visibility, map_vis.bitofs[cluster][DVIS_PVS], pvsrow);
***************
*** 1712,1716 ****
  	public static byte[] CM_ClusterPHS(int cluster) {
  		if (cluster == -1)
! 			Lib.memset(phsrow, (byte) 0, (numclusters + 7) >> 3);
  		else
  			CM_DecompressVis(map_visibility, map_vis.bitofs[cluster][Defines.DVIS_PHS], phsrow);
--- 1712,1716 ----
  	public static byte[] CM_ClusterPHS(int cluster) {
  		if (cluster == -1)
! 			Arrays.fill(phsrow, 0, (numclusters + 7) >> 3, (byte)0);
  		else
  			CM_DecompressVis(map_visibility, map_vis.bitofs[cluster][Defines.DVIS_PHS], phsrow);
***************
*** 1823,1830 ****
  
  		if (map_noareas.value != 0) { // for debugging, send everything
! 			Lib.memset(buffer, 255, bytes);
  		}
  		else {
! 			Lib.memset(buffer, 0, bytes);
  			floodnum = map_areas[area].floodnum;
  			for (i = 0; i < numareas; i++) {
--- 1823,1830 ----
  
  		if (map_noareas.value != 0) { // for debugging, send everything
! 			Arrays.fill(buffer, 0, bytes, (byte)255);
  		}
  		else {
! 			Arrays.fill(buffer, 0, bytes, (byte)0);
  			floodnum = map_areas[area].floodnum;
  			for (i = 0; i < numareas; i++) {