aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--engines/kyra/kyra_v2.h2
-rw-r--r--engines/kyra/script_v2.cpp14
2 files changed, 8 insertions, 8 deletions
diff --git a/engines/kyra/kyra_v2.h b/engines/kyra/kyra_v2.h
index 000f206b5d..e74be7aab8 100644
--- a/engines/kyra/kyra_v2.h
+++ b/engines/kyra/kyra_v2.h
@@ -1018,7 +1018,7 @@ protected:
int o2_setSpecialSceneScriptRunTime(ScriptState *script);
int o2_defineSceneAnim(ScriptState *script);
int o2_updateSceneAnim(ScriptState *script);
- int o2_setSceneAnimPosAndUpdate(ScriptState *script);
+ int o2_addToSceneAnimPosAndUpdate(ScriptState *script);
int o2_useItemOnMainChar(ScriptState *script);
int o2_startDialogue(ScriptState *script);
int o2_zanthRandomChat(ScriptState *script);
diff --git a/engines/kyra/script_v2.cpp b/engines/kyra/script_v2.cpp
index d89df97176..e439fe8539 100644
--- a/engines/kyra/script_v2.cpp
+++ b/engines/kyra/script_v2.cpp
@@ -864,14 +864,14 @@ int KyraEngine_v2::o2_updateSceneAnim(ScriptState *script) {
return 0;
}
-int KyraEngine_v2::o2_setSceneAnimPosAndUpdate(ScriptState *script) {
- debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_setSceneAnimPosAndUpdate(%p) (%d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3));
+int KyraEngine_v2::o2_addToSceneAnimPosAndUpdate(ScriptState *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);
- _sceneAnims[anim].y2 = stackPos(2);
+ _sceneAnims[anim].x2 += stackPos(1);
+ _sceneAnims[anim].y2 += stackPos(2);
if (_sceneAnims[anim].flags & 2) {
- _sceneAnims[anim].x = stackPos(1);
- _sceneAnims[anim].y = stackPos(2);
+ _sceneAnims[anim].x += stackPos(1);
+ _sceneAnims[anim].y += stackPos(2);
}
updateSceneAnim(anim, stackPos(3));
_specialSceneScriptRunFlag = false;
@@ -1531,7 +1531,7 @@ void KyraEngine_v2::setupOpcodeTable() {
Opcode(o2_defineSceneAnim),
Opcode(o2_updateSceneAnim),
Opcode(o2_updateSceneAnim),
- Opcode(o2_setSceneAnimPosAndUpdate),
+ Opcode(o2_addToSceneAnimPosAndUpdate),
// 0x74
Opcode(o2_useItemOnMainChar),
Opcode(o2_startDialogue),