From e774f60ec65f45ea98372b27b2bf677f5b15c479 Mon Sep 17 00:00:00 2001
From: Paweł Kołodziejski
Date: Mon, 9 May 2005 17:24:25 +0000
Subject: fixed warnings

svn-id: r18004
---
 common/system.h        | 2 +-
 scumm/logic_he.cpp     | 6 +++---
 scumm/script_v90he.cpp | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/system.h b/common/system.h
index c90b0aac6e..0be620b788 100644
--- a/common/system.h
+++ b/common/system.h
@@ -29,7 +29,7 @@
 #include "common/singleton.h"
 
 namespace Graphics {
-class Surface;
+struct Surface;
 } // end of namespace Graphics
 
 class SaveFileManager;
diff --git a/scumm/logic_he.cpp b/scumm/logic_he.cpp
index 61660d8f78..82a4e32569 100644
--- a/scumm/logic_he.cpp
+++ b/scumm/logic_he.cpp
@@ -121,7 +121,7 @@ int32 LogicHE::dispatch(int op, int numArgs, int32 *args) {
 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_1003(int32 *args) {
 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 @@ int32 LogicHE::op_1140(int32 *args) {
 	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);
 
diff --git a/scumm/script_v90he.cpp b/scumm/script_v90he.cpp
index 090cae7ca3..f80a895d12 100644
--- a/scumm/script_v90he.cpp
+++ b/scumm/script_v90he.cpp
@@ -2547,7 +2547,7 @@ void ScummEngine_v90he::o90_kernelGetFunctions() {
 	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 @@ void ScummEngine_v90he::o90_kernelSetFunctions() {
 	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);
-- 
cgit v1.2.3