[Jake2-commits] jake2/src/jake2/client CL_inv.java,1.2,1.3 CL.java,1.28,1.29 Key.java,1.11,1.12

[Carsten W. <ca...@us...>]

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

Modified Files:
	CL_inv.java CL.java Key.java 
Log Message:
byte[] <--> String
with latin 1 alias ISO-8859-1

Index: Key.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/client/Key.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Key.java	7 Jun 2005 12:57:21 -0000	1.11
--- Key.java	18 Dec 2005 22:10:12 -0000	1.12
***************
*** 705,709 ****
  		
  		key_lines[edit_line][1] = '/';
! 		byte[] bytes = s.getBytes();
  		System.arraycopy(bytes, 0, key_lines[edit_line], 2, bytes.length);
  		key_linepos = bytes.length + 2;
--- 705,709 ----
  		
  		key_lines[edit_line][1] = '/';
! 		byte[] bytes = Lib.stringToBytes(s);
  		System.arraycopy(bytes, 0, key_lines[edit_line], 2, bytes.length);
  		key_linepos = bytes.length + 2;

Index: CL.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/client/CL.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** CL.java	18 Dec 2005 16:43:51 -0000	1.28
--- CL.java	18 Dec 2005 22:10:10 -0000	1.29
***************
*** 721,727 ****
          // send a disconnect message to the server
          fin = (char) Defines.clc_stringcmd + "disconnect";
!         Netchan.Transmit(Globals.cls.netchan, fin.length(), fin.getBytes());
!         Netchan.Transmit(Globals.cls.netchan, fin.length(), fin.getBytes());
!         Netchan.Transmit(Globals.cls.netchan, fin.length(), fin.getBytes());
  
          ClearState();
--- 721,727 ----
          // send a disconnect message to the server
          fin = (char) Defines.clc_stringcmd + "disconnect";
!         Netchan.Transmit(Globals.cls.netchan, fin.length(), Lib.stringToBytes(fin));
!         Netchan.Transmit(Globals.cls.netchan, fin.length(), Lib.stringToBytes(fin));
!         Netchan.Transmit(Globals.cls.netchan, fin.length(), Lib.stringToBytes(fin));
  
          ClearState();

Index: CL_inv.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/client/CL_inv.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CL_inv.java	22 Sep 2004 19:22:08 -0000	1.2
--- CL_inv.java	18 Dec 2005 22:10:10 -0000	1.3
***************
*** 32,35 ****
--- 32,36 ----
  import jake2.qcommon.Com;
  import jake2.qcommon.MSG;
+ import jake2.util.Lib;
  import jake2.util.Vargs;
  
***************
*** 59,68 ****
  	}
  
! 	static void SetStringHighBit(String s) {
! 		byte[] b = s.getBytes();
  		for (int i = 0; i < b.length; i++) {
  			b[i] = (byte) (b[i] | 128);
  		}
! 		s = new String(b);
  	}
  
--- 60,69 ----
  	}
  
! 	static String getHighBitString(String s) {
! 		byte[] b = Lib.stringToBytes(s);
  		for (int i = 0; i < b.length; i++) {
  			b[i] = (byte) (b[i] | 128);
  		}
! 		return Lib.bytesToString(b);
  	}
  
***************
*** 132,136 ****
  					Globals.cl.configstrings[Defines.CS_ITEMS + item]));
  			if (item != selected)
! 				SetStringHighBit(string);
  			else // draw a blinky cursor by the selected item
  			{
--- 133,137 ----
  					Globals.cl.configstrings[Defines.CS_ITEMS + item]));
  			if (item != selected)
! 				string = getHighBitString(string);
  			else // draw a blinky cursor by the selected item
  			{