aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra/script_v2.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'engines/kyra/script_v2.cpp')
-rw-r--r--engines/kyra/script_v2.cpp336
1 files changed, 168 insertions, 168 deletions
diff --git a/engines/kyra/script_v2.cpp b/engines/kyra/script_v2.cpp
index e0b863a60d..585ce98295 100644
--- a/engines/kyra/script_v2.cpp
+++ b/engines/kyra/script_v2.cpp
@@ -34,7 +34,7 @@
namespace Kyra {
-int KyraEngine_v2::o2_setCharacterFacingRefresh(ScriptState *script) {
+int KyraEngine_v2::o2_setCharacterFacingRefresh(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_setCharacterFacingRefresh(%p) (-, %d, %d)", (const void *)script, stackPos(1), stackPos(2));
int animFrame = stackPos(2);
if (animFrame >= 0)
@@ -45,7 +45,7 @@ int KyraEngine_v2::o2_setCharacterFacingRefresh(ScriptState *script) {
return 0;
}
-int KyraEngine_v2::o2_setCharacterPos(ScriptState *script) {
+int KyraEngine_v2::o2_setCharacterPos(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_setCharacterFacingRefresh(%p) (-, %d, %d)", (const void *)script, stackPos(1), stackPos(2));
int x = stackPos(1);
int y = stackPos(2);
@@ -61,7 +61,7 @@ int KyraEngine_v2::o2_setCharacterPos(ScriptState *script) {
return 0;
}
-int KyraEngine_v2::o2_defineObject(ScriptState *script) {
+int KyraEngine_v2::o2_defineObject(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_defineObject(%p) (%d, '%s', %d, %d, %d, %d)", (const void *)script,
stackPos(0), stackPosString(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5));
TalkObject *object = &_talkObjectList[stackPos(0)];
@@ -73,7 +73,7 @@ int KyraEngine_v2::o2_defineObject(ScriptState *script) {
return 0;
}
-int KyraEngine_v2::o2_refreshCharacter(ScriptState *script) {
+int KyraEngine_v2::o2_refreshCharacter(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_refreshCharacter(%p) (-, %d, %d, %d)", (const void *)script, stackPos(1), stackPos(2), stackPos(3));
int unk = stackPos(1);
int facing = stackPos(2);
@@ -88,33 +88,33 @@ int KyraEngine_v2::o2_refreshCharacter(ScriptState *script) {
return 0;
}
-int KyraEngine_v2::o2_getCharacterX(ScriptState *script) {
+int KyraEngine_v2::o2_getCharacterX(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_getCharacterX(%p) ()", (const void *)script);
return _mainCharacter.x1;
}
-int KyraEngine_v2::o2_getCharacterY(ScriptState *script) {
+int KyraEngine_v2::o2_getCharacterY(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_getCharacterY(%p) ()", (const void *)script);
return _mainCharacter.y1;
}
-int KyraEngine_v2::o2_getCharacterFacing(ScriptState *script) {
+int KyraEngine_v2::o2_getCharacterFacing(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_getCharacterFacing(%p) ()", (const void *)script);
return _mainCharacter.facing;
}
-int KyraEngine_v2::o2_getCharacterScene(ScriptState *script) {
+int KyraEngine_v2::o2_getCharacterScene(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_getCharacterScene(%p) ()", (const void *)script);
return _mainCharacter.sceneId;
}
-int KyraEngine_v2::o2_setSceneComment(ScriptState *script) {
+int KyraEngine_v2::o2_setSceneComment(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_setSceneComment(%p) ('%s')", (const void *)script, stackPosString(0));
_sceneCommentString = stackPosString(0);
return 0;
}
-int KyraEngine_v2::o2_setCharacterAnimFrame(ScriptState *script) {
+int KyraEngine_v2::o2_setCharacterAnimFrame(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_setCharacterAnimFrame(%p) (-, %d, %d)", (const void *)script, stackPos(1), stackPos(2));
int animFrame = stackPos(1);
int updateAnim = stackPos(2);
@@ -126,14 +126,14 @@ int KyraEngine_v2::o2_setCharacterAnimFrame(ScriptState *script) {
return 0;
}
-int KyraEngine_v2::o2_setCharacterFacing(ScriptState *script) {
+int KyraEngine_v2::o2_setCharacterFacing(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_setCharacterFacing(%p) (%d)", (const void *)script, stackPos(0));
_mainCharacter.facing = stackPos(0);
_overwriteSceneFacing = 1;
return 0;
}
-int KyraEngine_v2::o2_trySceneChange(ScriptState *script) {
+int KyraEngine_v2::o2_trySceneChange(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_trySceneChange(%p) (%d, %d, %d, %d)", (const void *)script,
stackPos(0), stackPos(1), stackPos(2), stackPos(3));
@@ -142,7 +142,7 @@ int KyraEngine_v2::o2_trySceneChange(ScriptState *script) {
_unkHandleSceneChangeFlag = 0;
if (success) {
- _scriptInterpreter->initScript(script, script->dataPtr);
+ _emc->init(script, script->dataPtr);
_unk4 = 0;
_unk3 = -1;
_unk5 = 1;
@@ -152,45 +152,45 @@ int KyraEngine_v2::o2_trySceneChange(ScriptState *script) {
}
}
-int KyraEngine_v2::o2_moveCharacter(ScriptState *script) {
+int KyraEngine_v2::o2_moveCharacter(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_moveCharacter(%p) (%d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2));
moveCharacter(stackPos(0), stackPos(1), stackPos(2));
return 0;
}
-int KyraEngine_v2::o2_customCharacterChat(ScriptState *script) {
+int KyraEngine_v2::o2_customCharacterChat(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_customCharacterChat(%p) ('%s', %d, %d, %d, %d)", (const void *)script, stackPosString(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4));
playVoice(_vocHigh, stackPos(4));
_text->printCustomCharacterText(stackPosString(0), stackPos(1), stackPos(2), stackPos(3), 0, 2);
return 0;
}
-int KyraEngine_v2::o2_soundFadeOut(ScriptState *script) {
+int KyraEngine_v2::o2_soundFadeOut(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_soundFadeOut(%p) ()", (const void *)script);
_sound->beginFadeOut();
return 0;
}
-int KyraEngine_v2::o2_showChapterMessage(ScriptState *script) {
+int KyraEngine_v2::o2_showChapterMessage(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_showChapterMessage(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
showChapterMessage(stackPos(0), stackPos(1));
return 0;
}
-int KyraEngine_v2::o2_restoreTalkTextMessageBkgd(ScriptState *script) {
+int KyraEngine_v2::o2_restoreTalkTextMessageBkgd(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_restoreTalkTextMessageBkgd(%p) ()", (const void *)script);
_text->restoreTalkTextMessageBkgd(2, 0);
return 0;
}
-int KyraEngine_v2::o2_wsaClose(ScriptState *script) {
+int KyraEngine_v2::o2_wsaClose(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_wsaClose(%p) (%d)", (const void *)script, stackPos(0));
assert(stackPos(0) >= 0 && stackPos(0) < ARRAYSIZE(_wsaSlots));
_wsaSlots[stackPos(0)]->close();
return 0;
}
-int KyraEngine_v2::o2_meanWhileScene(ScriptState *script) {
+int KyraEngine_v2::o2_meanWhileScene(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_meanWhileScene(%p) (%d)", (const void *)script, stackPos(0));
static const uint8 jpSubtitle[] = { 0x88, 0xEA, 0x95, 0xFB, 0x81, 0x45, 0x81, 0x45, 0x81, 0x45 };
const char *cpsfile = stackPosString(0);
@@ -211,19 +211,19 @@ int KyraEngine_v2::o2_meanWhileScene(ScriptState *script) {
return 0;
}
-int KyraEngine_v2::o2_backUpScreen(ScriptState *script) {
+int KyraEngine_v2::o2_backUpScreen(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_backUpScreen(%p) (%d)", (const void *)script, stackPos(0));
_screen->copyRegionToBuffer(stackPos(0), 0, 0, 320, 144, _screenBuffer);
return 0;
}
-int KyraEngine_v2::o2_restoreScreen(ScriptState *script) {
+int KyraEngine_v2::o2_restoreScreen(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_restoreScreen(%p) (%d)", (const void *)script, stackPos(0));
_screen->copyBlockToPage(stackPos(0), 0, 0, 320, 144, _screenBuffer);
return 0;
}
-int KyraEngine_v2::o2_displayWsaFrame(ScriptState *script) {
+int KyraEngine_v2::o2_displayWsaFrame(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_displayWsaFrame(%p) (%d, %d, %d, %d, %d, %d, %d, %d, %d)", (const void *)script,
stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5), stackPos(6), stackPos(7), stackPos(8));
int frame = stackPos(0);
@@ -258,7 +258,7 @@ int KyraEngine_v2::o2_displayWsaFrame(ScriptState *script) {
return 0;
}
-int KyraEngine_v2::o2_displayWsaSequentialFramesLooping(ScriptState *script) {
+int KyraEngine_v2::o2_displayWsaSequentialFramesLooping(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_displayWsaSequentialFramesLooping(%p) (%d, %d, %d, %d, %d, %d, %d, %d)", (const void *)script,
stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5), stackPos(6), stackPos(7));
int startFrame = stackPos(0);
@@ -321,14 +321,14 @@ int KyraEngine_v2::o2_displayWsaSequentialFramesLooping(ScriptState *script) {
return 0;
}
-int KyraEngine_v2::o2_wsaOpen(ScriptState *script) {
+int KyraEngine_v2::o2_wsaOpen(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_wsaOpen(%p) ('%s', %d)", (const void *)script, stackPosString(0), stackPos(1));
assert(stackPos(1) >= 0 && stackPos(1) < ARRAYSIZE(_wsaSlots));
_wsaSlots[stackPos(1)]->open(stackPosString(0), 1, 0);
return 0;
}
-int KyraEngine_v2::o2_displayWsaSequentialFrames(ScriptState *script) {
+int KyraEngine_v2::o2_displayWsaSequentialFrames(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_displayWsaSequentialFrames(%p) (%d, %d, %d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5), stackPos(6));
uint16 frameDelay = stackPos(2) * _tickLength;
@@ -358,7 +358,7 @@ int KyraEngine_v2::o2_displayWsaSequentialFrames(ScriptState *script) {
return 0;
}
-int KyraEngine_v2::o2_displayWsaSequence(ScriptState *script) {
+int KyraEngine_v2::o2_displayWsaSequence(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_displayWsaSequence(%p) (%d, %d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5));
const int frameDelay = stackPos(2) * _tickLength;
@@ -392,7 +392,7 @@ int KyraEngine_v2::o2_displayWsaSequence(ScriptState *script) {
return 0;
}
-int KyraEngine_v2::o2_addItemToInventory(ScriptState *script) {
+int KyraEngine_v2::o2_addItemToInventory(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_addItemToInventory(%p) (%d, -, %d)", (const void *)script, stackPos(0), stackPos(2));
int slot = findFreeVisibleInventorySlot();
if (slot != -1) {
@@ -403,7 +403,7 @@ int KyraEngine_v2::o2_addItemToInventory(ScriptState *script) {
return slot;
}
-int KyraEngine_v2::o2_drawShape(ScriptState *script) {
+int KyraEngine_v2::o2_drawShape(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_drawShape(%p) (%d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4));
uint8 *shp = getShapePtr(stackPos(0) + 64);
@@ -430,7 +430,7 @@ int KyraEngine_v2::o2_drawShape(ScriptState *script) {
return 0;
}
-int KyraEngine_v2::o2_addItemToCurScene(ScriptState *script) {
+int KyraEngine_v2::o2_addItemToCurScene(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_addItemToCurScene(%p) (%d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2));
const int16 id = stackPos(0);
int x = stackPos(1);
@@ -452,25 +452,25 @@ int KyraEngine_v2::o2_addItemToCurScene(ScriptState *script) {
return 0;
}
-int KyraEngine_v2::o2_checkForItem(ScriptState *script) {
+int KyraEngine_v2::o2_checkForItem(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_checkForItem(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
return findItem(stackPos(0), stackPos(1)) == -1 ? 0 : 1;
}
-int KyraEngine_v2::o2_loadSoundFile(ScriptState *script) {
+int KyraEngine_v2::o2_loadSoundFile(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_loadSoundFile(%p) (%d)", (const void *)script, stackPos(0));
if (_sound->hasSoundFile(stackPos(0)))
snd_playTheme(stackPos(0), -1);
return 0;
}
-int KyraEngine_v2::o2_removeItemSlotFromInventory(ScriptState *script) {
+int KyraEngine_v2::o2_removeItemSlotFromInventory(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_removeItemSlotFromInventory(%p) (%d)", (const void *)script, stackPos(0));
removeItemFromInventory(stackPos(0));
return 0;
}
-int KyraEngine_v2::o2_defineItem(ScriptState *script) {
+int KyraEngine_v2::o2_defineItem(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_defineItem(%p) (%d, %d, %d, %d)", (const void *)script,
stackPos(0), stackPos(1), stackPos(2), stackPos(3));
int freeItem = findFreeItem();
@@ -485,7 +485,7 @@ int KyraEngine_v2::o2_defineItem(ScriptState *script) {
return freeItem;
}
-int KyraEngine_v2::o2_removeItemFromInventory(ScriptState *script) {
+int KyraEngine_v2::o2_removeItemFromInventory(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_removeItemFromInventory(%p) (%d)", (const void *)script, stackPos(0));
uint16 item = stackPos(0);
int slot = -1;
@@ -494,7 +494,7 @@ int KyraEngine_v2::o2_removeItemFromInventory(ScriptState *script) {
return 0;
}
-int KyraEngine_v2::o2_countItemInInventory(ScriptState *script) {
+int KyraEngine_v2::o2_countItemInInventory(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_countItemInInventory(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
uint16 item = stackPos(1);
int count = 0;
@@ -510,7 +510,7 @@ int KyraEngine_v2::o2_countItemInInventory(ScriptState *script) {
return count;
}
-int KyraEngine_v2::o2_countItemsInScene(ScriptState *script) {
+int KyraEngine_v2::o2_countItemsInScene(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_countItemsInScene(%p) (%d)", (const void *)script, stackPos(0));
int count = 0;
for (int i = 0; i < 30; ++i) {
@@ -520,45 +520,45 @@ int KyraEngine_v2::o2_countItemsInScene(ScriptState *script) {
return count;
}
-int KyraEngine_v2::o2_queryGameFlag(ScriptState *script) {
+int KyraEngine_v2::o2_queryGameFlag(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_queryGameFlag(%p) (%d)", (const void *)script, stackPos(0));
return queryGameFlag(stackPos(0));
}
-int KyraEngine_v2::o2_resetGameFlag(ScriptState *script) {
+int KyraEngine_v2::o2_resetGameFlag(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_resetGameFlag(%p) (%d)", (const void *)script, stackPos(0));
return resetGameFlag(stackPos(0));
}
-int KyraEngine_v2::o2_setGameFlag(ScriptState *script) {
+int KyraEngine_v2::o2_setGameFlag(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_setGameFlag(%p) (%d)", (const void *)script, stackPos(0));
return setGameFlag(stackPos(0));
}
-int KyraEngine_v2::o2_setHandItem(ScriptState *script) {
+int KyraEngine_v2::o2_setHandItem(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_setHandItem(%p) (%d)", (const void *)script, stackPos(0));
setHandItem(stackPos(0));
return 0;
}
-int KyraEngine_v2::o2_removeHandItem(ScriptState *script) {
+int KyraEngine_v2::o2_removeHandItem(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_removeHandItem(%p) ()", (const void *)script);
removeHandItem();
return 0;
}
-int KyraEngine_v2::o2_handItemSet(ScriptState *script) {
+int KyraEngine_v2::o2_handItemSet(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_handItemSet(%p) ()", (const void *)script);
return _handItemSet;
}
-int KyraEngine_v2::o2_hideMouse(ScriptState *script) {
+int KyraEngine_v2::o2_hideMouse(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_hideMouse(%p) ()", (const void *)script);
_screen->hideMouse();
return 0;
}
-int KyraEngine_v2::o2_addSpecialExit(ScriptState *script) {
+int KyraEngine_v2::o2_addSpecialExit(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_addSpecialExit(%p) (%d, %d, %d, %d, %d)", (const void *)script,
stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4));
if (_specialExitCount < 5) {
@@ -572,19 +572,19 @@ int KyraEngine_v2::o2_addSpecialExit(ScriptState *script) {
return 0;
}
-int KyraEngine_v2::o2_setMousePos(ScriptState *script) {
+int KyraEngine_v2::o2_setMousePos(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_setMousePos(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
setMousePos(stackPos(0), stackPos(1));
return 0;
}
-int KyraEngine_v2::o2_showMouse(ScriptState *script) {
+int KyraEngine_v2::o2_showMouse(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_showMouse(%p) ()", (const void *)script);
_screen->showMouse();
return 0;
}
-int KyraEngine_v2::o2_wipeDownMouseItem(ScriptState *script) {
+int KyraEngine_v2::o2_wipeDownMouseItem(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_wipeDownMouseItem(%p) (-, %d, %d)", (const void *)script, stackPos(1), stackPos(2));
_screen->hideMouse();
const int x = stackPos(1) - 8;
@@ -611,23 +611,23 @@ int KyraEngine_v2::o2_wipeDownMouseItem(ScriptState *script) {
return 0;
}
-int KyraEngine_v2::o2_getElapsedSecs(ScriptState *script) {
+int KyraEngine_v2::o2_getElapsedSecs(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_getElapsedSecs(%p) ()", (const void *)script);
return _system->getMillis() / 1000;
}
-int KyraEngine_v2::o2_getTimerDelay(ScriptState *script) {
+int KyraEngine_v2::o2_getTimerDelay(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_getTimerDelay(%p) (%d)", (const void *)script, stackPos(0));
return _timer->getDelay(stackPos(0));
}
-int KyraEngine_v2::o2_delaySecs(ScriptState *script) {
+int KyraEngine_v2::o2_delaySecs(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_delaySecs(%p) (%d)", (const void *)script, stackPos(0));
delay(stackPos(0) * 1000, true);
return 0;
}
-int KyraEngine_v2::o2_delay(ScriptState *script) {
+int KyraEngine_v2::o2_delay(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_delay(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
if (stackPos(1)) {
uint32 maxWaitTime = _system->getMillis() + stackPos(0) * _tickLength;
@@ -650,37 +650,37 @@ int KyraEngine_v2::o2_delay(ScriptState *script) {
return 0;
}
-int KyraEngine_v2::o2_setTimerDelay(ScriptState *script) {
+int KyraEngine_v2::o2_setTimerDelay(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_setTimerDelay(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
_timer->setDelay(stackPos(0), stackPos(1));
return 0;
}
-int KyraEngine_v2::o2_setScaleTableItem(ScriptState *script) {
+int KyraEngine_v2::o2_setScaleTableItem(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_setScaleTableItem(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
setScaleTableItem(stackPos(0), stackPos(1));
return 0;
}
-int KyraEngine_v2::o2_setDrawLayerTableItem(ScriptState *script) {
+int KyraEngine_v2::o2_setDrawLayerTableItem(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_setDrawLayerTableItem(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
setDrawLayerTableEntry(stackPos(0), stackPos(1));
return 0;
}
-int KyraEngine_v2::o2_setCharPalEntry(ScriptState *script) {
+int KyraEngine_v2::o2_setCharPalEntry(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_setCharPalEntry(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
setCharPalEntry(stackPos(0), stackPos(1));
return 0;
}
-int KyraEngine_v2::o2_loadZShapes(ScriptState *script) {
+int KyraEngine_v2::o2_loadZShapes(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_loadZShapes(%p) (%d)", (const void *)script, stackPos(0));
loadZShapes(stackPos(0));
return 0;
}
-int KyraEngine_v2::o2_drawSceneShape(ScriptState *script) {
+int KyraEngine_v2::o2_drawSceneShape(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_drawSceneShape(%p) (%d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1),
stackPos(2), stackPos(3));
@@ -705,7 +705,7 @@ int KyraEngine_v2::o2_drawSceneShape(ScriptState *script) {
return 0;
}
-int KyraEngine_v2::o2_drawSceneShapeOnPage(ScriptState *script) {
+int KyraEngine_v2::o2_drawSceneShapeOnPage(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_drawSceneShapeOnPage(%p) (%d, %d, %d, %d, %d)", (const void *)script,
stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4));
int shape = stackPos(0);
@@ -718,33 +718,33 @@ int KyraEngine_v2::o2_drawSceneShapeOnPage(ScriptState *script) {
return 0;
}
-int KyraEngine_v2::o2_disableAnimObject(ScriptState *script) {
+int KyraEngine_v2::o2_disableAnimObject(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_disableAnimObject(%p) (%d)", (const void *)script, stackPos(0));
_animObjects[stackPos(0)+1].enabled = false;
return 0;
}
-int KyraEngine_v2::o2_enableAnimObject(ScriptState *script) {
+int KyraEngine_v2::o2_enableAnimObject(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_enableAnimObject(%p) (%d)", (const void *)script, stackPos(0));
_animObjects[stackPos(0)+1].enabled = true;
return 0;
}
-int KyraEngine_v2::o2_loadPalette384(ScriptState *script) {
+int KyraEngine_v2::o2_loadPalette384(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_loadPalette384(%p) ('%s')", (const void *)script, stackPosString(0));
memcpy(_screen->getPalette(1), _screen->getPalette(0), 768);
_res->loadFileToBuf(stackPosString(0), _screen->getPalette(1), 384);
return 0;
}
-int KyraEngine_v2::o2_setPalette384(ScriptState *script) {
+int KyraEngine_v2::o2_setPalette384(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_setPalette384(%p) ()", (const void *)script);
memcpy(_screen->getPalette(0), _screen->getPalette(1), 384);
_screen->setScreenPalette(_screen->getPalette(0));
return 0;
}
-int KyraEngine_v2::o2_restoreBackBuffer(ScriptState *script) {
+int KyraEngine_v2::o2_restoreBackBuffer(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_restoreBackBuffer(%p) (%d)", (const void *)script, stackPos(0));
int disable = stackPos(0);
int oldState = 0;
@@ -762,40 +762,40 @@ int KyraEngine_v2::o2_restoreBackBuffer(ScriptState *script) {
return 0;
}
-int KyraEngine_v2::o2_backUpInventoryGfx(ScriptState *script) {
+int KyraEngine_v2::o2_backUpInventoryGfx(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_backUpInventoryGfx(%p) ()", (const void *)script);
_screen->copyRegionToBuffer(1, 0, 144, 320, 56, _screenBuffer);
_inventorySaved = true;
return 0;
}
-int KyraEngine_v2::o2_disableSceneAnim(ScriptState *script) {
+int KyraEngine_v2::o2_disableSceneAnim(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_disableSceneAnim(%p) (%d)", (const void *)script, stackPos(0));
_sceneAnims[stackPos(0)].flags &= ~1;
return 0;
}
-int KyraEngine_v2::o2_enableSceneAnim(ScriptState *script) {
+int KyraEngine_v2::o2_enableSceneAnim(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_enableSceneAnim(%p) (%d)", (const void *)script, stackPos(0));
_sceneAnims[stackPos(0)].flags |= 1;
return 0;
}
-int KyraEngine_v2::o2_restoreInventoryGfx(ScriptState *script) {
+int KyraEngine_v2::o2_restoreInventoryGfx(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_restoreInventoryGfx(%p) ()", (const void *)script);
_screen->copyBlockToPage(1, 0, 144, 320, 56, _screenBuffer);
_inventorySaved = false;
return 0;
}
-int KyraEngine_v2::o2_setSceneAnimPos2(ScriptState *script) {
+int KyraEngine_v2::o2_setSceneAnimPos2(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_setSceneAnimPos2(%p) (%d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2));
_sceneAnims[stackPos(0)].x2 = stackPos(1);
_sceneAnims[stackPos(0)].y2 = stackPos(2);
return 0;
}
-int KyraEngine_v2::o2_update(ScriptState *script) {
+int KyraEngine_v2::o2_update(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_update(%p) (%d)", (const void *)script, stackPos(0));
int times = stackPos(0);
@@ -809,13 +809,13 @@ int KyraEngine_v2::o2_update(ScriptState *script) {
return 0;
}
-int KyraEngine_v2::o2_fadeScenePal(ScriptState *script) {
+int KyraEngine_v2::o2_fadeScenePal(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_fadeScenePal(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
fadeScenePal(stackPos(0), stackPos(1));
return 0;
}
-int KyraEngine_v2::o2_enterNewSceneEx(ScriptState *script) {
+int KyraEngine_v2::o2_enterNewSceneEx(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_enterNewSceneEx(%p) (%d, %d, %d, %d, %d)", (const void *)script, stackPos(0),
stackPos(1), stackPos(2), stackPos(3), stackPos(4));
@@ -835,7 +835,7 @@ int KyraEngine_v2::o2_enterNewSceneEx(ScriptState *script) {
return 0;
}
-int KyraEngine_v2::o2_switchScene(ScriptState *script) {
+int KyraEngine_v2::o2_switchScene(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_switchScene(%p) (%d)", (const void *)script, stackPos(0));
setGameFlag(0x1EF);
_mainCharX = _mainCharacter.x1;
@@ -846,18 +846,18 @@ int KyraEngine_v2::o2_switchScene(ScriptState *script) {
return 0;
}
-int KyraEngine_v2::o2_getShapeFlag1(ScriptState *script) {
+int KyraEngine_v2::o2_getShapeFlag1(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_getShapeFlag1(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
return _screen->getShapeFlag1(stackPos(0), stackPos(1));
}
-int KyraEngine_v2::o2_setPathfinderFlag(ScriptState *script) {
+int KyraEngine_v2::o2_setPathfinderFlag(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_setPathfinderFlag(%p) (%d)", (const void *)script, stackPos(0));
_pathfinderFlag = stackPos(0);
return 0;
}
-int KyraEngine_v2::o2_getSceneExitToFacing(ScriptState *script) {
+int KyraEngine_v2::o2_getSceneExitToFacing(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_getSceneExitToFacing(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
const int scene = stackPos(0);
const int facing = stackPos(1);
@@ -873,7 +873,7 @@ int KyraEngine_v2::o2_getSceneExitToFacing(ScriptState *script) {
return -1;
}
-int KyraEngine_v2::o2_setLayerFlag(ScriptState *script) {
+int KyraEngine_v2::o2_setLayerFlag(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_setLayerFlag(%p) (%d)", (const void *)script, stackPos(0));
int layer = stackPos(0);
if (layer >= 1 && layer <= 16)
@@ -881,7 +881,7 @@ int KyraEngine_v2::o2_setLayerFlag(ScriptState *script) {
return 0;
}
-int KyraEngine_v2::o2_setZanthiaPos(ScriptState *script) {
+int KyraEngine_v2::o2_setZanthiaPos(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_setZanthiaPos(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
_mainCharX = stackPos(0);
_mainCharY = stackPos(1);
@@ -894,51 +894,51 @@ int KyraEngine_v2::o2_setZanthiaPos(ScriptState *script) {
return 0;
}
-int KyraEngine_v2::o2_loadMusicTrack(ScriptState *script) {
+int KyraEngine_v2::o2_loadMusicTrack(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_loadMusicTrack(%p) (%d)", (const void *)script, stackPos(0));
snd_loadSoundFile(stackPos(0));
return 0;
}
-int KyraEngine_v2::o2_playWanderScoreViaMap(ScriptState *script) {
+int KyraEngine_v2::o2_playWanderScoreViaMap(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_playWanderScoreViaMap(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
snd_playWanderScoreViaMap(stackPos(0), stackPos(1));
return 0;
}
-int KyraEngine_v2::o2_playSoundEffect(ScriptState *script) {
+int KyraEngine_v2::o2_playSoundEffect(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_playSoundEffect(%p) (%d)", (const void *)script, stackPos(0));
snd_playSoundEffect(stackPos(0));
return 0;
}
-int KyraEngine_v2::o2_setSceneAnimPos(ScriptState *script) {
+int KyraEngine_v2::o2_setSceneAnimPos(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_setSceneAnimPos(%p) (%d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2));
_sceneAnims[stackPos(0)].x = stackPos(1);
_sceneAnims[stackPos(0)].y = stackPos(2);
return 0;
}
-int KyraEngine_v2::o2_blockInRegion(ScriptState *script) {
+int KyraEngine_v2::o2_blockInRegion(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_blockInRegion(%p) (%d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3));
_screen->blockInRegion(stackPos(0), stackPos(1), stackPos(2)-stackPos(0)+1, stackPos(3)-stackPos(1)+1);
return 0;
}
-int KyraEngine_v2::o2_blockOutRegion(ScriptState *script) {
+int KyraEngine_v2::o2_blockOutRegion(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_blockOutRegion(%p) (%d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3));
_screen->blockOutRegion(stackPos(0), stackPos(1), stackPos(2)-stackPos(0)+1, stackPos(3)-stackPos(1)+1);
return 0;
}
-int KyraEngine_v2::o2_setCauldronState(ScriptState *script) {
+int KyraEngine_v2::o2_setCauldronState(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_setCauldronState(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
setCauldronState(stackPos(0), stackPos(1) != 0);
clearCauldronTable();
return 0;
}
-int KyraEngine_v2::o2_showItemString(ScriptState *script) {
+int KyraEngine_v2::o2_showItemString(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_showItemString(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
const int item = stackPos(0);
@@ -959,30 +959,30 @@ int KyraEngine_v2::o2_showItemString(ScriptState *script) {
return 0;
}
-int KyraEngine_v2::o2_getRand(ScriptState *script) {
+int KyraEngine_v2::o2_getRand(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_getRand(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
assert(stackPos(0) < stackPos(1));
return _rnd.getRandomNumberRng(stackPos(0), stackPos(1));
}
-int KyraEngine_v2::o2_isAnySoundPlaying(ScriptState *script) {
+int KyraEngine_v2::o2_isAnySoundPlaying(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_isAnySoundPlaying(%p) ()", (const void *)script);
return _sound->voiceIsPlaying();
}
-int KyraEngine_v2::o2_setDeathHandlerFlag(ScriptState *script) {
+int KyraEngine_v2::o2_setDeathHandlerFlag(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_setDeathHandlerFlag(%p) (%d)", (const void *)script, stackPos(0));
_deathHandler = stackPos(0);
return 0;
}
-int KyraEngine_v2::o2_setDrawNoShapeFlag(ScriptState *script) {
+int KyraEngine_v2::o2_setDrawNoShapeFlag(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_setDrawNoShapeFlag(%p) (%d)", (const void *)script, stackPos(0));
_drawNoShapeFlag = (stackPos(0) != 0);
return 0;
}
-int KyraEngine_v2::o2_setRunFlag(ScriptState *script) {
+int KyraEngine_v2::o2_setRunFlag(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_setRunFlag(%p) (%d)", (const void *)script, stackPos(0));
// this is usually just _runFlag, but since this is just used when the game should play the credits
// we handle it a bit different :-)
@@ -991,7 +991,7 @@ int KyraEngine_v2::o2_setRunFlag(ScriptState *script) {
return 0;
}
-int KyraEngine_v2::o2_showLetter(ScriptState *script) {
+int KyraEngine_v2::o2_showLetter(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_showLetter(%p) (%d)", (const void *)script, stackPos(0));
const int letter = stackPos(0);
char filename[16];
@@ -1051,13 +1051,13 @@ int KyraEngine_v2::o2_showLetter(ScriptState *script) {
return 0;
}
-int KyraEngine_v2::o2_fillRect(ScriptState *script) {
+int KyraEngine_v2::o2_fillRect(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_fillRect(%p) (%d, %d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5));
_screen->fillRect(stackPos(1), stackPos(2), stackPos(1)+stackPos(3), stackPos(2)+stackPos(4), stackPos(5), stackPos(0));
return 0;
}
-int KyraEngine_v2::o2_waitForConfirmationClick(ScriptState *script) {
+int KyraEngine_v2::o2_waitForConfirmationClick(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_waitForConfirmationClick(%p) (%d)", (const void *)script, stackPos(0));
resetSkipFlag();
uint32 maxWaitTime = _system->getMillis() + stackPos(0) * _tickLength;
@@ -1081,14 +1081,14 @@ int KyraEngine_v2::o2_waitForConfirmationClick(ScriptState *script) {
return 1;
}
-int KyraEngine_v2::o2_encodeShape(ScriptState *script) {
+int KyraEngine_v2::o2_encodeShape(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_encodeShape(%p) (%d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1),
stackPos(2), stackPos(3), stackPos(4));
_sceneShapeTable[stackPos(0)] = _screen->encodeShape(stackPos(1), stackPos(2), stackPos(3), stackPos(4), 2);
return 0;
}
-int KyraEngine_v2::o2_defineRoomEntrance(ScriptState *script) {
+int KyraEngine_v2::o2_defineRoomEntrance(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_defineRoomEntrance(%p) (%d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2));
switch (stackPos(0)) {
case 0:
@@ -1117,7 +1117,7 @@ int KyraEngine_v2::o2_defineRoomEntrance(ScriptState *script) {
return 0;
}
-int KyraEngine_v2::o2_runTemporaryScript(ScriptState *script) {
+int KyraEngine_v2::o2_runTemporaryScript(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_runTemporaryScript(%p) ('%s', %d, %d, %d)", (const void *)script, stackPosString(0), stackPos(1),
stackPos(2), stackPos(3));
@@ -1125,14 +1125,14 @@ int KyraEngine_v2::o2_runTemporaryScript(ScriptState *script) {
return 0;
}
-int KyraEngine_v2::o2_setSpecialSceneScriptRunTime(ScriptState *script) {
+int KyraEngine_v2::o2_setSpecialSceneScriptRunTime(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_setSpecialSceneScriptRunTime(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
assert(stackPos(0) >= 0 && stackPos(0) < 10);
_sceneSpecialScriptsTimer[stackPos(0)] = _system->getMillis() + stackPos(1) * _tickLength;
return 0;
}
-int KyraEngine_v2::o2_defineSceneAnim(ScriptState *script) {
+int KyraEngine_v2::o2_defineSceneAnim(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_defineSceneAnim(%p) (%d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, '%s')", (const void *)script,
stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5), stackPos(6), stackPos(7), stackPos(8),
stackPos(9), stackPos(10), stackPos(11), stackPosString(12));
@@ -1165,7 +1165,7 @@ int KyraEngine_v2::o2_defineSceneAnim(ScriptState *script) {
return 0;
}
-int KyraEngine_v2::o2_updateSceneAnim(ScriptState *script) {
+int KyraEngine_v2::o2_updateSceneAnim(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_updateSceneAnim(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
updateSceneAnim(stackPos(0), stackPos(1));
@@ -1189,7 +1189,7 @@ int KyraEngine_v2::o2_updateSceneAnim(ScriptState *script) {
return 0;
}
-int KyraEngine_v2::o2_addToSceneAnimPosAndUpdate(ScriptState *script) {
+int KyraEngine_v2::o2_addToSceneAnimPosAndUpdate(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_addToSceneAnimPosAndUpdate(%p) (%d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3));
const int anim = stackPos(0);
_sceneAnims[anim].x2 += stackPos(1);
@@ -1203,48 +1203,48 @@ int KyraEngine_v2::o2_addToSceneAnimPosAndUpdate(ScriptState *script) {
return 0;
}
-int KyraEngine_v2::o2_useItemOnMainChar(ScriptState *script) {
- ScriptState tmpScript;
- _scriptInterpreter->initScript(&tmpScript, &_npcScriptData);
- _scriptInterpreter->startScript(&tmpScript, 0);
+int KyraEngine_v2::o2_useItemOnMainChar(EMCState *script) {
+ EMCState tmpScript;
+ _emc->init(&tmpScript, &_npcScriptData);
+ _emc->start(&tmpScript, 0);
tmpScript.regs[4] = _itemInHand;
tmpScript.regs[0] = _mainCharacter.sceneId;
int oldVocH = _vocHigh;
_vocHigh = 0x5a;
- while(_scriptInterpreter->validScript(&tmpScript))
- _scriptInterpreter->runScript(&tmpScript);
+ while(_emc->isValid(&tmpScript))
+ _emc->run(&tmpScript);
_vocHigh = oldVocH;
return 0;
}
-int KyraEngine_v2::o2_startDialogue(ScriptState *script) {
+int KyraEngine_v2::o2_startDialogue(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_startDialogue(%p) (%d)", (const void *)script, stackPos(0));
startDialogue(stackPos(0));
return 0;
}
-int KyraEngine_v2::o2_zanthRandomChat(ScriptState *script) {
+int KyraEngine_v2::o2_zanthRandomChat(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_zanthRandomChat(%p)", (const void *)script);
zanthRandomIdleChat();
return 0;
}
-int KyraEngine_v2::o2_setupDialogue(ScriptState *script) {
+int KyraEngine_v2::o2_setupDialogue(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_setupDialogue(%p) (%d)", (const void *)script, stackPos(0));
setNewDlgIndex(stackPos(0));
return 0;
}
-int KyraEngine_v2::o2_getDlgIndex(ScriptState *script) {
+int KyraEngine_v2::o2_getDlgIndex(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_setNewDlgIndex(%p) (%d)", (const void *)script, stackPos(0));
return _mainCharacter.dlgIndex;
}
-int KyraEngine_v2::o2_defineRoom(ScriptState *script) {
+int KyraEngine_v2::o2_defineRoom(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_defineRoom(%p) (%d, '%s', %d, %d, %d, %d, %d, %d)", (const void *)script,
stackPos(0), stackPosString(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5), stackPos(6), stackPos(7));
SceneDesc *scene = &_sceneList[stackPos(0)];
@@ -1266,24 +1266,24 @@ int KyraEngine_v2::o2_defineRoom(ScriptState *script) {
return 0;
}
-int KyraEngine_v2::o2_addCauldronStateTableEntry(ScriptState *script) {
+int KyraEngine_v2::o2_addCauldronStateTableEntry(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_addCauldronStateTableEntry(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
return addToCauldronStateTable(stackPos(0), stackPos(1)) ? 1 : 0;
}
-int KyraEngine_v2::o2_setCountDown(ScriptState *script) {
+int KyraEngine_v2::o2_setCountDown(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_setCountDown(%p) (%d)", (const void *)script, stackPos(0));
_scriptCountDown = _system->getMillis() + stackPos(0) * _tickLength;
return 0;
}
-int KyraEngine_v2::o2_getCountDown(ScriptState *script) {
+int KyraEngine_v2::o2_getCountDown(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_getCountDown(%p)", (const void *)script);
uint32 time = _system->getMillis();
return (time > _scriptCountDown) ? 0 : (_scriptCountDown - time) / _tickLength;
}
-int KyraEngine_v2::o2_pressColorKey(ScriptState *script) {
+int KyraEngine_v2::o2_pressColorKey(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_pressColorKey(%p) (%d)", (const void *)script, stackPos(0));
for (int i = 6; i; i--)
_inputColorCode[i] = _inputColorCode[i - 1];
@@ -1295,7 +1295,7 @@ int KyraEngine_v2::o2_pressColorKey(ScriptState *script) {
return 1;
}
-int KyraEngine_v2::o2_objectChat(ScriptState *script) {
+int KyraEngine_v2::o2_objectChat(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_objectChat(%p) ('%s', %d)", (const void *)script, stackPosString(0), stackPos(1));
if (_flags.isTalkie)
warning("Unexpected call: o2_objectChat(%p) ('%s', %d)", (const void *)script, stackPosString(0), stackPos(1));
@@ -1304,7 +1304,7 @@ int KyraEngine_v2::o2_objectChat(ScriptState *script) {
return 0;
}
-int KyraEngine_v2::o2_chapterChange(ScriptState *script) {
+int KyraEngine_v2::o2_chapterChange(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_chapterChange(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
const int chapter = stackPos(0);
const int scene = stackPos(1);
@@ -1326,40 +1326,40 @@ int KyraEngine_v2::o2_chapterChange(ScriptState *script) {
return 0;
}
-int KyraEngine_v2::o2_getColorCodeFlag1(ScriptState *script) {
+int KyraEngine_v2::o2_getColorCodeFlag1(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_getColorCodeFlag1(%p) ()", (const void *)script);
return _colorCodeFlag1;
}
-int KyraEngine_v2::o2_setColorCodeFlag1(ScriptState *script) {
+int KyraEngine_v2::o2_setColorCodeFlag1(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_getColorCodeFlag1(%p) (%d)", (const void *)script, stackPos(0));
_colorCodeFlag1 = stackPos(0);
return 0;
}
-int KyraEngine_v2::o2_getColorCodeFlag2(ScriptState *script) {
+int KyraEngine_v2::o2_getColorCodeFlag2(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_getColorCodeFlag2(%p) ()", (const void *)script);
return _colorCodeFlag2;
}
-int KyraEngine_v2::o2_setColorCodeFlag2(ScriptState *script) {
+int KyraEngine_v2::o2_setColorCodeFlag2(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_getColorCodeFlag2(%p) (%d)", (const void *)script, stackPos(0));
_colorCodeFlag2 = stackPos(0);
return 0;
}
-int KyraEngine_v2::o2_getColorCodeValue(ScriptState *script) {
+int KyraEngine_v2::o2_getColorCodeValue(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_getColorCodeValue(%p) (%d)", (const void *)script, stackPos(0));
return _presetColorCode[stackPos(0)];
}
-int KyraEngine_v2::o2_setColorCodeValue(ScriptState *script) {
+int KyraEngine_v2::o2_setColorCodeValue(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_setColorCodeValue(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
_presetColorCode[stackPos(0)] = stackPos(1) & 0xff;
return stackPos(1) & 0xff;
}
-int KyraEngine_v2::o2_countItemInstances(ScriptState *script) {
+int KyraEngine_v2::o2_countItemInstances(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_countItemInstances(%p) (%d)", (const void *)script, stackPos(0));
uint16 item = stackPos(0);
@@ -1391,7 +1391,7 @@ int KyraEngine_v2::o2_countItemInstances(ScriptState *script) {
return count;
}
-int KyraEngine_v2::o2_removeItemFromScene(ScriptState *script) {
+int KyraEngine_v2::o2_removeItemFromScene(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_removeItemFromScene(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
const int scene = stackPos(0);
const uint16 item = stackPos(1);
@@ -1402,13 +1402,13 @@ int KyraEngine_v2::o2_removeItemFromScene(ScriptState *script) {
return 0;
}
-int KyraEngine_v2::o2_initObject(ScriptState *script) {
+int KyraEngine_v2::o2_initObject(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_initObject(%p) (%d)", (const void *)script, stackPos(0));
initTalkObject(stackPos(0));
return 0;
}
-int KyraEngine_v2::o2_npcChat(ScriptState *script) {
+int KyraEngine_v2::o2_npcChat(EMCState *script) {
if (_flags.isTalkie) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_npcChat(%p) ('%s', %d, %d, %d)", (const void *)script, stackPosString(0), stackPos(1), _vocHigh, stackPos(2));
npcChatSequence(stackPosString(0), stackPos(1), _vocHigh, stackPos(2));
@@ -1419,58 +1419,58 @@ int KyraEngine_v2::o2_npcChat(ScriptState *script) {
return 0;
}
-int KyraEngine_v2::o2_deinitObject(ScriptState *script) {
+int KyraEngine_v2::o2_deinitObject(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_deinitObject(%p) (%d)", (const void *)script, stackPos(0));
deinitTalkObject(stackPos(0));
return 0;
}
-int KyraEngine_v2::o2_playTimSequence(ScriptState *script) {
+int KyraEngine_v2::o2_playTimSequence(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_playTimSequence(%p) ('%s')", (const void *)script, stackPosString(0));
playTim(stackPosString(0));
return 0;
}
-int KyraEngine_v2::o2_makeBookOrCauldronAppear(ScriptState *script) {
+int KyraEngine_v2::o2_makeBookOrCauldronAppear(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_makeBookOrCauldronAppear(%p) (%d)", (const void *)script, stackPos(0));
seq_makeBookOrCauldronAppear(stackPos(0));
return 0;
}
-int KyraEngine_v2::o2_setSpecialSceneScriptState(ScriptState *script) {
+int KyraEngine_v2::o2_setSpecialSceneScriptState(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_setSpecialSceneScriptState(%p) (%d)", (const void *)script, stackPos(0));
_specialSceneScriptState[stackPos(0)] = 1;
return 1;
}
-int KyraEngine_v2::o2_clearSpecialSceneScriptState(ScriptState *script) {
+int KyraEngine_v2::o2_clearSpecialSceneScriptState(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_clearSpecialSceneScriptState(%p) (%d)", (const void *)script, stackPos(0));
_specialSceneScriptState[stackPos(0)] = 0;
return 0;
}
-int KyraEngine_v2::o2_querySpecialSceneScriptState(ScriptState *script) {
+int KyraEngine_v2::o2_querySpecialSceneScriptState(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_querySpecialSceneScriptState(%p) (%d)", (const void *)script, stackPos(0));
return _specialSceneScriptState[stackPos(0)];
}
-int KyraEngine_v2::o2_resetInputColorCode(ScriptState *script) {
+int KyraEngine_v2::o2_resetInputColorCode(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_resetInputColorCode(%p)", (const void *)script);
memset(_inputColorCode, 255, 7);
return 0;
}
-int KyraEngine_v2::o2_setHiddenItemsEntry(ScriptState *script) {
+int KyraEngine_v2::o2_setHiddenItemsEntry(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_setHiddenItemsEntry(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
return (_hiddenItems[stackPos(0)] = stackPos(1));
}
-int KyraEngine_v2::o2_getHiddenItemsEntry(ScriptState *script) {
+int KyraEngine_v2::o2_getHiddenItemsEntry(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_getHiddenItemsEntry(%p) (%d)", (const void *)script, stackPos(0));
return _hiddenItems[stackPos(0)];
}
-int KyraEngine_v2::o2_mushroomEffect(ScriptState *script) {
+int KyraEngine_v2::o2_mushroomEffect(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_mushroomEffect(%p)", (const void *)script);
memcpy(_screen->getPalette(2), _screen->_currentPalette, 768);
@@ -1495,7 +1495,7 @@ int KyraEngine_v2::o2_mushroomEffect(ScriptState *script) {
return 0;
}
-int KyraEngine_v2::o2_customChat(ScriptState *script) {
+int KyraEngine_v2::o2_customChat(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_customChat(%p) ('%s', %d, %d)", (const void *)script, stackPosString(0), stackPos(1), stackPos(2));
strcpy((char*)_unkBuf500Bytes, stackPosString(0));
_chatText = (char*)_unkBuf500Bytes;
@@ -1507,7 +1507,7 @@ int KyraEngine_v2::o2_customChat(ScriptState *script) {
return 0;
}
-int KyraEngine_v2::o2_customChatFinish(ScriptState *script) {
+int KyraEngine_v2::o2_customChatFinish(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_customChatFinish(%p) ()", (const void *)script);
_text->restoreScreen();
_chatText = 0;
@@ -1515,7 +1515,7 @@ int KyraEngine_v2::o2_customChatFinish(ScriptState *script) {
return 0;
}
-int KyraEngine_v2::o2_setupSceneAnimation(ScriptState *script) {
+int KyraEngine_v2::o2_setupSceneAnimation(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_setupSceneAnimation(%p) (%d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, '%s')", (const void *)script,
stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5), stackPos(6), stackPos(7), stackPos(8), stackPos(9), stackPos(10), stackPos(11), stackPosString(12));
const int index = stackPos(0);
@@ -1589,7 +1589,7 @@ int KyraEngine_v2::o2_setupSceneAnimation(ScriptState *script) {
return 0;
}
-int KyraEngine_v2::o2_stopSceneAnimation(ScriptState *script) {
+int KyraEngine_v2::o2_stopSceneAnimation(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_stopSceneAnimation(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
const int index = stackPos(0);
AnimObj &obj = _animObjects[1+index];
@@ -1609,25 +1609,25 @@ int KyraEngine_v2::o2_stopSceneAnimation(ScriptState *script) {
return 0;
}
-int KyraEngine_v2::o2_disableTimer(ScriptState *script) {
+int KyraEngine_v2::o2_disableTimer(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_disableTimer(%p) (%d)", (const void *)script, stackPos(0));
_timer->disable(stackPos(0));
return 0;
}
-int KyraEngine_v2::o2_enableTimer(ScriptState *script) {
+int KyraEngine_v2::o2_enableTimer(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_enableTimer(%p) (%d)", (const void *)script, stackPos(0));
_timer->enable(stackPos(0));
return 0;
}
-int KyraEngine_v2::o2_setTimerCountdown(ScriptState *script) {
+int KyraEngine_v2::o2_setTimerCountdown(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_setTimerCountdown(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
_timer->setCountdown(stackPos(0), stackPos(1));
return 0;
}
-int KyraEngine_v2::o2_processPaletteIndex(ScriptState *script) {
+int KyraEngine_v2::o2_processPaletteIndex(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_processPaletteIndex(%p) (%d, %d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5));
uint8 *palette = _screen->getPalette(0);
const int index = stackPos(0);
@@ -1645,7 +1645,7 @@ int KyraEngine_v2::o2_processPaletteIndex(ScriptState *script) {
return 0;
}
-int KyraEngine_v2::o2_updateTwoSceneAnims(ScriptState *script) {
+int KyraEngine_v2::o2_updateTwoSceneAnims(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_updateTwoSceneAnims(%p) (%d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3));
updateSceneAnim(stackPos(0), stackPos(1));
updateSceneAnim(stackPos(2), stackPos(3));
@@ -1653,12 +1653,12 @@ int KyraEngine_v2::o2_updateTwoSceneAnims(ScriptState *script) {
return 0;
}
-int KyraEngine_v2::o2_getRainbowRoomData(ScriptState *script) {
+int KyraEngine_v2::o2_getRainbowRoomData(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_getRainbowRoomData(%p) (%d)", (const void *)script, stackPos(0));
return _rainbowRoomData[stackPos(0)];
}
-int KyraEngine_v2::o2_drawSceneShapeEx(ScriptState *script) {
+int KyraEngine_v2::o2_drawSceneShapeEx(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_drawSceneShapeEx(%p) (%d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3));
const int itemShape = stackPos(0) + 64;
const int x = stackPos(1);
@@ -1676,12 +1676,12 @@ int KyraEngine_v2::o2_drawSceneShapeEx(ScriptState *script) {
return 0;
}
-int KyraEngine_v2::o2_getBoolFromStack(ScriptState *script) {
+int KyraEngine_v2::o2_getBoolFromStack(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_getBoolFromStack(%p) ()", (const void *)script);
return stackPos(0) ? 1 : 0;
}
-int KyraEngine_v2::o2_getSfxDriver(ScriptState *script) {
+int KyraEngine_v2::o2_getSfxDriver(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_getSfxDriver(%p) ()", (const void *)script);
if (_sound->getSfxType() == Sound::kAdlib)
return 1;
@@ -1693,13 +1693,13 @@ int KyraEngine_v2::o2_getSfxDriver(ScriptState *script) {
return 0;
}
-int KyraEngine_v2::o2_getVocSupport(ScriptState *script) {
+int KyraEngine_v2::o2_getVocSupport(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_getVocSupport(%p) ()", (const void *)script);
// we always support VOC file playback
return 1;
}
-int KyraEngine_v2::o2_getMusicDriver(ScriptState *script) {
+int KyraEngine_v2::o2_getMusicDriver(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_getMusicDriver(%p) ()", (const void *)script);
if (_sound->getMusicType() == Sound::kAdlib)
return 1;
@@ -1711,45 +1711,45 @@ int KyraEngine_v2::o2_getMusicDriver(ScriptState *script) {
return 0;
}
-int KyraEngine_v2::o2_setVocHigh(ScriptState *script) {
+int KyraEngine_v2::o2_setVocHigh(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_setVocHigh(%p) (%d)", (const void *)script, stackPos(0));
_vocHigh = stackPos(0);
return _vocHigh;
}
-int KyraEngine_v2::o2_getVocHigh(ScriptState *script) {
+int KyraEngine_v2::o2_getVocHigh(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_getVocHigh(%p) ()", (const void *)script);
return _vocHigh;
}
-int KyraEngine_v2::o2_zanthiaChat(ScriptState *script) {
+int KyraEngine_v2::o2_zanthiaChat(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_zanthiaChat(%p) ('%s', %d)", (const void *)script, stackPosString(0), stackPos(1));
objectChat(stackPosString(0), 0, _vocHigh, stackPos(1));
return 0;
}
-int KyraEngine_v2::o2_isVoiceEnabled(ScriptState *script) {
+int KyraEngine_v2::o2_isVoiceEnabled(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_isVoiceEnabled(%p) ()", (const void *)script);
return speechEnabled() ? 1 : 0;
}
-int KyraEngine_v2::o2_isVoicePlaying(ScriptState *script) {
+int KyraEngine_v2::o2_isVoicePlaying(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_isVoicePlaying(%p) ()", (const void *)script);
return (snd_voiceIsPlaying() && !skipFlag()) ? 1 : 0;
}
-int KyraEngine_v2::o2_stopVoicePlaying(ScriptState *script) {
+int KyraEngine_v2::o2_stopVoicePlaying(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_stopVoicePlaying(%p) ()", (const void *)script);
snd_stopVoice();
return 0;
}
-int KyraEngine_v2::o2_getGameLanguage(ScriptState *script) {
+int KyraEngine_v2::o2_getGameLanguage(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_getGameLanguage(%p) ()", (const void *)script);
return _lang;
}
-int KyraEngine_v2::o2_demoFinale(ScriptState *script) {
+int KyraEngine_v2::o2_demoFinale(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_demoFinale(%p) ()", (const void *)script);
if (!_flags.isDemo)
return 0;
@@ -1783,14 +1783,14 @@ int KyraEngine_v2::o2_demoFinale(ScriptState *script) {
return 0;
}
-int KyraEngine_v2::o2_dummy(ScriptState *script) {
+int KyraEngine_v2::o2_dummy(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_dummy(%p) ()", (const void *)script);
return 0;
}
#pragma mark -
-int KyraEngine_v2::o2t_defineNewShapes(ScriptState *script) {
+int KyraEngine_v2::o2t_defineNewShapes(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2t_defineNewShapes(%p) ('%s', %d, %d, %d, %d, %d, %d)", (const void *)script, stackPosString(0),
stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5), stackPos(6));
@@ -1805,7 +1805,7 @@ int KyraEngine_v2::o2t_defineNewShapes(ScriptState *script) {
return 0;
}
-int KyraEngine_v2::o2t_setCurrentFrame(ScriptState *script) {
+int KyraEngine_v2::o2t_setCurrentFrame(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2t_setCurrentFrame(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
_newShapeAnimFrame = stackPos(0);
_newShapeDelay = stackPos(1);
@@ -1813,19 +1813,19 @@ int KyraEngine_v2::o2t_setCurrentFrame(ScriptState *script) {
return 0;
}
-int KyraEngine_v2::o2t_playSoundEffect(ScriptState *script) {
+int KyraEngine_v2::o2t_playSoundEffect(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2t_playSoundEffect(%p) (%d)", (const void *)script, stackPos(0));
snd_playSoundEffect(stackPos(0));
return 0;
}
-int KyraEngine_v2::o2t_fadeScenePal(ScriptState *script) {
+int KyraEngine_v2::o2t_fadeScenePal(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2t_fadeScenePal(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
fadeScenePal(stackPos(0), stackPos(1));
return 0;
}
-int KyraEngine_v2::o2t_setShapeFlag(ScriptState *script) {
+int KyraEngine_v2::o2t_setShapeFlag(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2t_setShapeFlag(%p) (%d)", (const void *)script, stackPos(0));
if (_flags.isTalkie)
_newShapeFlag = stackPos(0);
@@ -1872,7 +1872,7 @@ int KyraEngine_v2::t2_playSoundEffect(const TIM *tim, const uint16 *param) {
#pragma mark -
-typedef Common::Functor1Mem<ScriptState*, int, KyraEngine_v2> OpcodeV2;
+typedef Common::Functor1Mem<EMCState*, int, KyraEngine_v2> OpcodeV2;
#define SetOpcodeTable(x) table = &x;
#define Opcode(x) table->push_back(new OpcodeV2(this, &KyraEngine_v2::x))
#define OpcodeUnImpl() table->push_back(new OpcodeV2(this, 0))
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-16 10:41:41 +0000