[Scummvm-git-logs] scummvm master -> edc3d61cc2741b436e507b4bb013a513b3f90636

[dwatteau]

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:
edc3d61cc2 SCUMM: JANITORIAL: Rename _enableEnhancements to enhancementEnabled in comments


Commit: edc3d61cc2741b436e507b4bb013a513b3f90636
    https://github.com/scummvm/scummvm/commit/edc3d61cc2741b436e507b4bb013a513b3f90636
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2024-08-02T21:35:53+02:00

Commit Message:
SCUMM: JANITORIAL: Rename _enableEnhancements to enhancementEnabled in comments

Changed paths:
    engines/scumm/room.cpp
    engines/scumm/script_v2.cpp
    engines/scumm/script_v5.cpp
    engines/scumm/script_v6.cpp


diff --git a/engines/scumm/room.cpp b/engines/scumm/room.cpp
index dd3e48d6857..ca8bca13ba5 100644
--- a/engines/scumm/room.cpp
+++ b/engines/scumm/room.cpp
@@ -486,7 +486,7 @@ void ScummEngine::setupRoomSubBlocks() {
 	// fact to fix the object class of obj 182. This should match what the
 	// 2016 remaster did.
 	//
-	// Not using `_enableEnhancements` since leaving the room too quickly
+	// Not using enhancementEnabled since leaving the room too quickly
 	// would just make this puzzle impossible to complete.
 	if (_game.id == GID_TENTACLE && _roomResource == 26 && readVar(0x8000 + 69)
 			&& getClass(182, kObjectClassUntouchable)) {
diff --git a/engines/scumm/script_v2.cpp b/engines/scumm/script_v2.cpp
index 9174cad9b39..8951b1ae6d6 100644
--- a/engines/scumm/script_v2.cpp
+++ b/engines/scumm/script_v2.cpp
@@ -405,7 +405,7 @@ void ScummEngine_v2::decodeParseString() {
 	// So we add some extra spaces at the end of the string if it's too short; this
 	// unblocks the cutscene and also lets Sandy react as intended.
 	//
-	// (Not using `_enableEnhancements` because some users could be really confused
+	// (Not using enhancementEnabled because some users could be really confused
 	// by the game hanging and they may not know about the Esc key.)
 	if (_game.id == GID_MANIAC && _game.platform != Common::kPlatformNES && _language == Common::FR_FRA && _currentScript != 0xFF && vm.slot [_currentScript].number == 155 && _roomResource == 31 && _actorToPrintStrFor == 9) {
 		while (ptr - buffer < 100) {
diff --git a/engines/scumm/script_v5.cpp b/engines/scumm/script_v5.cpp
index 4b79515ff1d..347a9db87a7 100644
--- a/engines/scumm/script_v5.cpp
+++ b/engines/scumm/script_v5.cpp
@@ -1525,7 +1525,7 @@ void ScummEngine_v5::o5_isEqual() {
 	// pirate hat to the antique dealer on Booty Island, making Guybrush
 	// silent when he asks about these two particular objects.
 	//
-	// Not using `_enableEnhancements`, since this small oversight only
+	// Not using enhancementEnabled, since this small oversight only
 	// exists in this fan-made edition which was made for enhancements.
 	if (_game.id == GID_MONKEY2 && (_game.features & GF_ULTIMATE_TALKIE) && _roomResource == 48 && _currentScript != 0xFF && vm.slot [_currentScript].number == 215 && a == vm.localvar[_currentScript][0]) {
 		if (a == 550 && b == 530)
@@ -1545,7 +1545,7 @@ void ScummEngine_v5::o5_isEqual() {
 	// Try to detect and skip them, which as much care as possible for any
 	// future update or fan translation which would change this.
 	//
-	// Intentionally not using `_enableEnhancements` for this version.
+	// Intentionally not using enhancementEnabled for this version.
 	if (_game.id == GID_MONKEY2 && (_game.features & GF_ULTIMATE_TALKIE) &&
 		_roomResource == 47 && vm.slot[_currentScript].number == 218 &&
 		var == 0x4000 + 1 && a == vm.localvar[_currentScript][1] &&
@@ -1601,7 +1601,7 @@ void ScummEngine_v5::o5_isLessEqual() {
 	// comparison, possibly with the intent of checking for a gamepad.
 	//
 	// Since the biplane is unplayable without this, we don't check for
-	// `_enableEnhancements`, and always enable this fix.
+	// enhancementEnabled, and always enable this fix.
 	if (_game.id == GID_INDY3 && (_game.platform == Common::kPlatformFMTowns) &&
 	    (vm.slot[_currentScript].number == 200 || vm.slot[_currentScript].number == 203) &&
 	    _currentRoom == 70 && b == -256) {
@@ -3090,7 +3090,7 @@ void ScummEngine_v5::o5_walkActorTo() {
 	// This is because the box matrix is initialized too late in the entry
 	// script for that room, so we have to do it a bit earlier.
 	//
-	// Intentionally not using `_enableEnhancements`, since you can get
+	// Intentionally not using enhancementEnabled, since you can get
 	// completely stuck.
 	if (_game.id == GID_INDY4 && _currentScript != 0xFF && vm.slot[_currentScript].number == 10002 &&
 		_currentRoom == (_game.platform == Common::kPlatformAmiga ? 58 : 60) &&
diff --git a/engines/scumm/script_v6.cpp b/engines/scumm/script_v6.cpp
index 6955cd4fbb7..9a7daea045d 100644
--- a/engines/scumm/script_v6.cpp
+++ b/engines/scumm/script_v6.cpp
@@ -1029,7 +1029,7 @@ void ScummEngine_v6::o6_jump() {
 	// This is a script bug, due to a missing jump in one segment of the script,
 	// and it also happens with the original interpreters.
 	//
-	// Intentionally not using `_enableEnhancements`, since having the game hang
+	// Intentionally not using enhancementEnabled, since having the game hang
 	// is not useful to anyone.
 	if (_game.id == GID_SAMNMAX && vm.slot[_currentScript].number == 101 && readVar(0x8000 + 97) == 1 && offset == 1) {
 		offset = -18;