[Scummvm-cvs-logs] CVS: scummvm/scumm logic_he.cpp,2.2,2.3 script_v90he.cpp,2.249,2.250

[Pawel Kolodziejski]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30752/scumm

Modified Files:
	logic_he.cpp script_v90he.cpp 
Log Message:
fixed warnings

Index: logic_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/logic_he.cpp,v
retrieving revision 2.2
retrieving revision 2.3
diff -u -d -r2.2 -r2.3
--- logic_he.cpp	9 May 2005 02:30:31 -0000	2.2
+++ logic_he.cpp	9 May 2005 17:24:24 -0000	2.3
@@ -121,7 +121,7 @@
 int32 LogicHE::op_1003(int32 *args) {
 	int value = args[2] ? args[2] : 1;
 
-	_vm->writeVar(108, (int32)(atan(args[0] / args[1]) * RAD2DEG * value));
+	_vm->writeVar(108, (int32)(atan((float)(args[0] / args[1])) * RAD2DEG * value));
 
 	return 1;
 }
@@ -129,7 +129,7 @@
 int32 LogicHE::op_1004(int32 *args) {
 	int value = args[1] ? args[1] : 1;
 
-	_vm->writeVar(108, (int32)(sqrt(args[0]) * value));
+	_vm->writeVar(108, (int32)(sqrt((float)args[0]) * value));
 
 	return 1;
 }
@@ -308,7 +308,7 @@
 	res = args[1] - 2 * (arg2 * args[0] + arg3 * args[1]) * arg3;
 	
 	if (-args[3] * args[3] >= 0)
-		res *= 0.83333331;
+		res *= 0.83333331f;
 
 	_vm->writeVar(109, (int32)res);
 

Index: script_v90he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v90he.cpp,v
retrieving revision 2.249
retrieving revision 2.250
diff -u -d -r2.249 -r2.250
--- script_v90he.cpp	8 May 2005 10:59:32 -0000	2.249
+++ script_v90he.cpp	9 May 2005 17:24:25 -0000	2.250
@@ -2547,7 +2547,7 @@
 	case 2001:
 		// Used in football
 		debug(0, "o90_kernelGetFunctions: U32 code %d (args %d) %d", args[1], num - 2, args[2]);
-		push(_logicHE->dispatch(args[1], num - 2, &args[2]));
+		push(_logicHE->dispatch(args[1], num - 2, (int32 *)&args[2]));
 		break;
 	default:
 		error("o90_kernelGetFunctions: default case %d", args[0]);
@@ -2613,7 +2613,7 @@
 	case 2001:
 		// Used in SoccerMLS/Soccer2004
 		debug(0, "o90_kernelSetFunctions: U32 code %d (args %d) %d", args[1], num - 2, args[2]);
-		_logicHE->dispatch(args[1], num - 2, &args[2]);
+		_logicHE->dispatch(args[1], num - 2, (int32 *)&args[2]);
 		break;
 	default:
 		error("o90_kernelSetFunctions: default case %d (param count %d)", args[0], num);