[Scummvm-git-logs] scummvm master -> 337eac68fdb05ee57736d31a4bcfab05241ebf79

[mgerhardy]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
337eac68fd TWINE: renamed scene patch variable to _enableEnhancements


Commit: 337eac68fdb05ee57736d31a4bcfab05241ebf79
    https://github.com/scummvm/scummvm/commit/337eac68fdb05ee57736d31a4bcfab05241ebf79
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2022-04-18T12:53:54+02:00

Commit Message:
TWINE: renamed scene patch variable to _enableEnhancements

scumm engine is using this wording, and we should keep it in sync if we ever expose
this option more globally

Changed paths:
    engines/twine/debugger/console.cpp
    engines/twine/debugger/console.h
    engines/twine/scene/scene.cpp
    engines/twine/scene/scene.h
    engines/twine/script/script_life_v1.cpp


diff --git a/engines/twine/debugger/console.cpp b/engines/twine/debugger/console.cpp
index faf34a52e69..499c390b7c5 100644
--- a/engines/twine/debugger/console.cpp
+++ b/engines/twine/debugger/console.cpp
@@ -71,7 +71,7 @@ TwinEConsole::TwinEConsole(TwinEEngine *engine) : _engine(engine), GUI::Debugger
 	registerCmd("set_holomap_flag", WRAP_METHOD(TwinEConsole, doSetHolomapFlag));
 	registerCmd("set_holomap_trajectory", WRAP_METHOD(TwinEConsole, doSetHolomapTrajectory));
 	registerCmd("show_holomap_flag", WRAP_METHOD(TwinEConsole, doPrintGameFlag));
-	registerCmd("toggle_scene_patches", WRAP_METHOD(TwinEConsole, doToggleScenePatches));
+	registerCmd("toggle_enhancements", WRAP_METHOD(TwinEConsole, doToggleEnhancements));
 }
 
 TwinEConsole::~TwinEConsole() {
@@ -109,8 +109,8 @@ bool TwinEConsole::doToggleGodMode(int argc, const char **argv) {
 	return true;
 }
 
-bool TwinEConsole::doToggleScenePatches(int argc, const char **argv) {
-	TOGGLE_DEBUG(_engine->_scene->_useScenePatches, "use scene patches\n")
+bool TwinEConsole::doToggleEnhancements(int argc, const char **argv) {
+	TOGGLE_DEBUG(_engine->_scene->_enableEnhancements, "enable enhancements\n")
 	return true;
 }
 
diff --git a/engines/twine/debugger/console.h b/engines/twine/debugger/console.h
index 708aa700d9e..b5153feb4b9 100644
--- a/engines/twine/debugger/console.h
+++ b/engines/twine/debugger/console.h
@@ -57,7 +57,7 @@ private:
 	bool doToggleActorRendering(int argc, const char **argv);
 	bool doToggleTrackRendering(int argc, const char **argv);
 	bool doToggleGodMode(int argc, const char **argv);
-	bool doToggleScenePatches(int argc, const char **argv);
+	bool doToggleEnhancements(int argc, const char **argv);
 	bool doToggleFreeCamera(int argc, const char **argv);
 	bool doToggleSceneChanges(int argc, const char **argv);
 	bool doToggleSceneRendering(int argc, const char **argv);
diff --git a/engines/twine/scene/scene.cpp b/engines/twine/scene/scene.cpp
index 0cf36ed1675..f3b2417577f 100644
--- a/engines/twine/scene/scene.cpp
+++ b/engines/twine/scene/scene.cpp
@@ -392,7 +392,7 @@ bool Scene::loadSceneLBA1() {
 		point->z = (int16)stream.readUint16LE();
 	}
 
-	if (_useScenePatches) {
+	if (_enableEnhancements) {
 		switch (_currentSceneIdx) {
 		case LBA1SceneId::Hamalayi_Mountains_landing_place:
 			_sceneActors[21]._pos.x = _sceneActors[21]._collisionPos.x = 6656 + 256;
@@ -483,7 +483,7 @@ void Scene::dumpSceneScripts() const {
 
 void Scene::changeScene() {
 	if (_engine->isLBA1()) {
-		if (_useScenePatches) {
+		if (_enableEnhancements) {
 			if (_currentSceneIdx == LBA1SceneId::Citadel_Island_Harbor && _needChangeScene == LBA1SceneId::Principal_Island_Harbor) {
 				if (_sceneNumZones >= 15 && _sceneNumTracks >= 8) {
 					const ZoneStruct *zone = &_sceneZones[15];
diff --git a/engines/twine/scene/scene.h b/engines/twine/scene/scene.h
index f5ee0e2cffd..bff0b73ee27 100644
--- a/engines/twine/scene/scene.h
+++ b/engines/twine/scene/scene.h
@@ -195,7 +195,7 @@ public:
 	int16 _currentlyFollowedActor = OWN_ACTOR_SCENE_INDEX;
 	/** Current actor in zone - climbing a ladder */
 	bool _currentActorInZone = false;
-	bool _useScenePatches = false;
+	bool _enableEnhancements = false;
 	/** Current actor manipulated in scripts */
 	int16 _currentScriptValue = 0;
 
diff --git a/engines/twine/script/script_life_v1.cpp b/engines/twine/script/script_life_v1.cpp
index 74b595a8773..3fc45938812 100644
--- a/engines/twine/script/script_life_v1.cpp
+++ b/engines/twine/script/script_life_v1.cpp
@@ -1233,7 +1233,7 @@ static int32 lZOOM(TwinEEngine *engine, LifeScriptContext &ctx) {
 static int32 lPOS_POINT(TwinEEngine *engine, LifeScriptContext &ctx) {
 	const int32 trackIdx = ctx.stream.readByte();
 	debugC(3, kDebugLevels::kDebugScripts, "LIFE::POS_POINT(%i)", (int)trackIdx);
-	if (engine->_scene->_useScenePatches) {
+	if (engine->_scene->_enableEnhancements) {
 		if (IS_HERO(ctx.actorIdx) && engine->_scene->_currentSceneIdx == LBA1SceneId::Citadel_Island_Harbor && trackIdx == 8) {
 			ctx.stream.rewind(2);
 			ctx.stream.writeByte(0x34); // CHANGE_CUBE