From 20ef91ee28410c1a95d8ef31934a2babde86dc07 Mon Sep 17 00:00:00 2001 From: Martin Gerhardy Date: Mon, 26 Oct 2020 19:54:04 +0100 Subject: [PATCH] TWINE: renamed source files --- engines/twine/module.mk | 4 ++-- engines/twine/{script_life.cpp => script_life_v1.cpp} | 2 +- engines/twine/{script_life.h => script_life_v1.h} | 0 engines/twine/{script_move.cpp => script_move_v1.cpp} | 3 ++- engines/twine/{script_move.h => script_move_v1.h} | 0 engines/twine/twine.cpp | 4 ++-- 6 files changed, 7 insertions(+), 6 deletions(-) rename engines/twine/{script_life.cpp => script_life_v1.cpp} (99%) rename engines/twine/{script_life.h => script_life_v1.h} (100%) rename engines/twine/{script_move.cpp => script_move_v1.cpp} (99%) rename engines/twine/{script_move.h => script_move_v1.h} (100%) diff --git a/engines/twine/module.mk b/engines/twine/module.mk index 2716de5512b..f3afd43fc95 100644 --- a/engines/twine/module.mk +++ b/engines/twine/module.mk @@ -27,8 +27,8 @@ MODULE_OBJS := \ resources.o \ scene.o \ screens.o \ - script_life.o \ - script_move.o \ + script_life_v1.o \ + script_move_v1.o \ sound.o \ text.o \ twine.o diff --git a/engines/twine/script_life.cpp b/engines/twine/script_life_v1.cpp similarity index 99% rename from engines/twine/script_life.cpp rename to engines/twine/script_life_v1.cpp index 01e4bba9530..0e341c88fc4 100644 --- a/engines/twine/script_life.cpp +++ b/engines/twine/script_life_v1.cpp @@ -20,7 +20,7 @@ * */ -#include "twine/script_life.h" +#include "twine/script_life_v1.h" #include "common/stream.h" #include "twine/actor.h" #include "twine/animations.h" diff --git a/engines/twine/script_life.h b/engines/twine/script_life_v1.h similarity index 100% rename from engines/twine/script_life.h rename to engines/twine/script_life_v1.h diff --git a/engines/twine/script_move.cpp b/engines/twine/script_move_v1.cpp similarity index 99% rename from engines/twine/script_move.cpp rename to engines/twine/script_move_v1.cpp index eb26399aba2..d966360bef6 100644 --- a/engines/twine/script_move.cpp +++ b/engines/twine/script_move_v1.cpp @@ -20,7 +20,7 @@ * */ -#include "twine/script_move.h" +#include "twine/script_move_v1.h" #include "common/textconsole.h" #include "common/util.h" #include "twine/actor.h" @@ -583,6 +583,7 @@ ScriptMove::ScriptMove(TwinEEngine *engine) : _engine(engine) { void ScriptMove::processMoveScript(int32 actorIdx) { ActorStruct *actor = _engine->_scene->getActor(actorIdx); move = &actor->move; + numRepeatSample = 1; int32 end = -2; diff --git a/engines/twine/script_move.h b/engines/twine/script_move_v1.h similarity index 100% rename from engines/twine/script_move.h rename to engines/twine/script_move_v1.h diff --git a/engines/twine/twine.cpp b/engines/twine/twine.cpp index a6d2a1000e1..ad3146adac9 100644 --- a/engines/twine/twine.cpp +++ b/engines/twine/twine.cpp @@ -63,8 +63,8 @@ #include "twine/resources.h" #include "twine/scene.h" #include "twine/screens.h" -#include "twine/script_life.h" -#include "twine/script_move.h" +#include "twine/script_life_v1.h" +#include "twine/script_move_v1.h" #include "twine/sound.h" #include "twine/text.h"