thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed warnings

Browse source 
svn-id: r18004
This commit is contained in:
Paweł Kołodziejski 2005-05-09 17:24:25 +00:00
parent 0a5e9f24f5
commit e774f60ec6
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
common/system.h
View file

@ -29,7 +29,7 @@
#include "common/singleton.h" #include "common/singleton.h"
namespace Graphics { namespace Graphics {
class Surface; struct Surface;
} // end of namespace Graphics } // end of namespace Graphics
class SaveFileManager; class SaveFileManager;

6
scumm/logic_he.cpp
View file

@ -121,7 +121,7 @@ int32 LogicHE::dispatch(int op, int numArgs, int32 *args) {
int32 LogicHE::op_1003(int32 *args) { int32 LogicHE::op_1003(int32 *args) {
int value = args[2] ? args[2] : 1; 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; return 1;
} }
@ -129,7 +129,7 @@ int32 LogicHE::op_1003(int32 *args) {
int32 LogicHE::op_1004(int32 *args) { int32 LogicHE::op_1004(int32 *args) {
int value = args[1] ? args[1] : 1; 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; return 1;
} }
@ -308,7 +308,7 @@ int32 LogicHE::op_1140(int32 *args) {
res = args[1] - 2 * (arg2 * args[0] + arg3 * args[1]) * arg3; res = args[1] - 2 * (arg2 * args[0] + arg3 * args[1]) * arg3;
if (-args[3] * args[3] >= 0) if (-args[3] * args[3] >= 0)
res *= 0.83333331; res *= 0.83333331f;
_vm->writeVar(109, (int32)res); _vm->writeVar(109, (int32)res);

4
scumm/script_v90he.cpp
View file

@ -2547,7 +2547,7 @@ void ScummEngine_v90he::o90_kernelGetFunctions() {
case 2001: case 2001:
// Used in football // Used in football
debug(0, "o90_kernelGetFunctions: U32 code %d (args %d) %d", args[1], num - 2, args[2]); 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; break;
default: default:
error("o90_kernelGetFunctions: default case %d", args[0]); error("o90_kernelGetFunctions: default case %d", args[0]);
@ -2613,7 +2613,7 @@ void ScummEngine_v90he::o90_kernelSetFunctions() {
case 2001: case 2001:
// Used in SoccerMLS/Soccer2004 // Used in SoccerMLS/Soccer2004
debug(0, "o90_kernelSetFunctions: U32 code %d (args %d) %d", args[1], num - 2, args[2]); 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; break;
default: default:
error("o90_kernelSetFunctions: default case %d (param count %d)", args[0], num); error("o90_kernelSetFunctions: default case %d (param count %d)", args[0], num);