diff options
author | Lars Persson | 2010-10-13 07:14:38 +0000 |
---|---|---|
committer | Lars Persson | 2010-10-13 07:14:38 +0000 |
commit | c0e2f1c6f8f7df66ae6c090f6c16aea14ebe8bf3 (patch) | |
tree | 812422f7f16527311b658b7b196d55753372d6f6 /engines/toon/toon.cpp | |
parent | 6527c01cb501958bc04117da3d965b956e77704c (diff) | |
download | scummvm-rg350-c0e2f1c6f8f7df66ae6c090f6c16aea14ebe8bf3.tar.gz scummvm-rg350-c0e2f1c6f8f7df66ae6c090f6c16aea14ebe8bf3.tar.bz2 scummvm-rg350-c0e2f1c6f8f7df66ae6c090f6c16aea14ebe8bf3.zip |
TOON: Updated code to build properly for WINSCW and GCCE(symbian)
Added templates to MAX & MIN functions. Correct usage of OpcodeV2(instead of Opcode)
Match implementation with function definition. (int32 is not == int on all platforms)
svn-id: r53401
Diffstat (limited to 'engines/toon/toon.cpp')
-rw-r--r-- | engines/toon/toon.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/toon/toon.cpp b/engines/toon/toon.cpp index 7489f5c5d9..dae258adc1 100644 --- a/engines/toon/toon.cpp +++ b/engines/toon/toon.cpp @@ -1099,7 +1099,7 @@ void ToonEngine::loadCursor() { setCursor(5); } -void ToonEngine::setCursor(int32 type, bool inventory, int32 offsetX, int32 offsetY) { +void ToonEngine::setCursor(int32 type, bool inventory, int32 offsetX, int offsetY) { static const int32 offsets[] = { 0, 1, 1, 6, 7, 1, 8, 10, 18, 10, @@ -2234,7 +2234,7 @@ int32 ToonEngine::getConversationFlag(int32 locationId, int32 param) { return 1; } -int ToonEngine::runConversationCommand(int16 **command) { +int32 ToonEngine::runConversationCommand(int16 **command) { // Strangerke - Commented (not used) // int16 com = **command; @@ -2822,7 +2822,7 @@ bool ToonEngine::loadGame(int32 slot) { _sceneAnimationScripts[i]._active = loadFile->readByte(); _sceneAnimationScripts[i]._frozen = loadFile->readByte(); int32 oldTimer = loadFile->readSint32BE(); - _sceneAnimationScripts[i]._lastTimer = MAX(0,oldTimer + timerDiff); + _sceneAnimationScripts[i]._lastTimer = MAX<int32>(0,oldTimer + timerDiff); _script->loadState(&_sceneAnimationScripts[i]._state, loadFile); } |