TWINE: don't use the global var

scummvm · Oct 26, 2020 · bb76f5e · bb76f5e
1 parent 927e6cc
commit bb76f5e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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 */