diff options
| -rw-r--r-- | engines/kyra/scene_v2.cpp | 6 | ||||
| -rw-r--r-- | engines/kyra/script_v2.cpp | 2 | ||||
| -rw-r--r-- | engines/parallaction/parallaction_ns.cpp | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/engines/kyra/scene_v2.cpp b/engines/kyra/scene_v2.cpp index fbda1f8455..7863fa6638 100644 --- a/engines/kyra/scene_v2.cpp +++ b/engines/kyra/scene_v2.cpp @@ -689,11 +689,13 @@ int KyraEngine_v2::findWay(int x, int y, int toX, int toY, int *moveTable, int m x &= ~3; toX &= ~3; y &= ~1; toY &= ~1; int size = KyraEngine::findWay(x, y, toX, toY, moveTable, moveTableSize); - /*if (size) { + if (size) { +/* int temp = pathfinderUnk1(moveTable); temp = pathfinderUnk3(temp, x, y); pathfinderUnk5(moveTable, temp, x, y, moveTableSize); - }*/ +*/ + } return getMoveTableSize(moveTable); } diff --git a/engines/kyra/script_v2.cpp b/engines/kyra/script_v2.cpp index ce1cd99e03..3e1bc4ed2f 100644 --- a/engines/kyra/script_v2.cpp +++ b/engines/kyra/script_v2.cpp @@ -281,7 +281,7 @@ int KyraEngine_v2::o2_drawSceneShapeOnPage(ScriptState *script) { } int KyraEngine_v2::o2_restoreBackBuffer(ScriptState *script) { - debugC(3, kDebugLevelScriptFuncs, "o2_restoreBackBuffer(%p) (%d, %d)", (const void *)script, stackPos(0)); + debugC(3, kDebugLevelScriptFuncs, "o2_restoreBackBuffer(%p) (%d)", (const void *)script, stackPos(0)); int disable = stackPos(0); int oldState = 0; if (disable) { diff --git a/engines/parallaction/parallaction_ns.cpp b/engines/parallaction/parallaction_ns.cpp index 742f2c860a..e9030b0abb 100644 --- a/engines/parallaction/parallaction_ns.cpp +++ b/engines/parallaction/parallaction_ns.cpp @@ -70,7 +70,7 @@ int Parallaction_ns::init() { void Parallaction_ns::callFunction(uint index, void* parm) { printf("index = %i\n", index); - assert(index >= 0 && index < 25); // magic value 25 is maximum # of callables for Nippon Safes + assert(index < 25); // magic value 25 is maximum # of callables for Nippon Safes (this->*_callables[index])(parm); } |