From bb76f5ed991c8be2edb1a41932c89a917c64400c Mon Sep 17 00:00:00 2001 From: Martin Gerhardy Date: Mon, 26 Oct 2020 18:10:39 +0100 Subject: [PATCH] TWINE: don't use the global var --- engines/twine/script_move.cpp | 2 +- engines/twine/twine.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/engines/twine/script_move.cpp b/engines/twine/script_move.cpp index 4045d0673521..706acc6c1d4d 100644 --- a/engines/twine/script_move.cpp +++ b/engines/twine/script_move.cpp @@ -592,7 +592,7 @@ void ScriptMove::processMoveScript(int32 actorIdx) { do { scriptPosition = actor->positionInMoveScript; // TODO: use Common::MemoryReadStream for the script parsing - scriptPtr = actor->moveScript + scriptPosition; + scriptPtr = actor->moveScript + actor->positionInMoveScript; int32 scriptOpcode = *(scriptPtr++); actor->positionInMoveScript++; diff --git a/engines/twine/twine.h b/engines/twine/twine.h index 98a292642eed..4bf1265c3627 100644 --- a/engines/twine/twine.h +++ b/engines/twine/twine.h @@ -49,7 +49,7 @@ namespace TwinE { /** Original screen height */ #define DEFAULT_SCREEN_HEIGHT 480 /** Scale screen to double size */ -#define SCALE 1 +#define SCALE 1 // TODO: remove me or support me /** Original screen width */ #define SCREEN_WIDTH DEFAULT_SCREEN_WIDTH *SCALE /** Original screen height */