[Jake2-commits] jake2/src/jake2/qcommon Cvar.java,1.1.1.1,1.2

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

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

Modified Files:
	Cvar.java 
Log Message:
replace atof()

Index: Cvar.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/qcommon/Cvar.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Cvar.java	7 Jul 2004 19:59:30 -0000	1.1.1.1
--- Cvar.java	20 Jul 2004 11:02:24 -0000	1.2
***************
*** 133,137 ****
  
  		var.string = value;
! 		var.value = Lib.atof(var.string);
  		var.flags = flags;
  
--- 133,142 ----
  
  		var.string = value;
! 		try {
! 			var.value = Float.parseFloat(var.string);
! 		} catch (Exception e) {
! 			var.value = 0.0f;
! 		}
! 		
  		var.flags = flags;
  
***************
*** 187,197 ****
  				if (Com.ServerState() != 0) {
  					Com.Printf(var_name + " will be changed for next game.\n");
- 					//var.latched_string = CopyString(value);
  					var.latched_string = value;
  				}
  				else {
- 					//var.string = CopyString(value);
  					var.string = value;
! 					var.value = Lib.atof(var.string);
  					if (var.name.equals("game")) {
  						FS.SetGamedir(var.string);
--- 192,204 ----
  				if (Com.ServerState() != 0) {
  					Com.Printf(var_name + " will be changed for next game.\n");
  					var.latched_string = value;
  				}
  				else {
  					var.string = value;
! 					try {
! 						var.value = Float.parseFloat(var.string);
! 					} catch (Exception e) {
! 						var.value = 0.0f;
! 					}
  					if (var.name.equals("game")) {
  						FS.SetGamedir(var.string);
***************
*** 217,225 ****
  			Globals.userinfo_modified = true; // transmit at next oportunity
  
- 		//Z_Free(var.string); // free the old value string
- 
- 		//var.string = CopyString(value);
  		var.string = value;
! 		var.value = Lib.atof(var.string);
  
  		return var;
--- 224,233 ----
  			Globals.userinfo_modified = true; // transmit at next oportunity
  
  		var.string = value;
! 		try {
! 			var.value = Float.parseFloat(var.string);
! 		} catch (Exception e) {
! 			var.value = 0.0f;
! 		}
  
  		return var;
***************
*** 312,316 ****
  		if (var == null)
  			return 0;
! 		return Lib.atof(var.string);
  	}
  
--- 320,328 ----
  		if (var == null)
  			return 0;
! 		float val = 0.0f;
! 		try {
! 			val = Float.parseFloat(var.string);
! 		} catch (Exception e) {}
! 		return val;
  	}