[Scummvm-git-logs] scummvm master -> 956f24294b7aeef4f2bbdd2352cfeb252ee4508e

[eriktorbjorn]

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:
956f24294b SCUMM: Remove redundant checks, pointed out by sluicebox


Commit: 956f24294b7aeef4f2bbdd2352cfeb252ee4508e
    https://github.com/scummvm/scummvm/commit/956f24294b7aeef4f2bbdd2352cfeb252ee4508e
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2023-11-23T08:44:45+01:00

Commit Message:
SCUMM: Remove redundant checks, pointed out by sluicebox

Changed paths:
    engines/scumm/charset.cpp
    engines/scumm/scumm.cpp


diff --git a/engines/scumm/charset.cpp b/engines/scumm/charset.cpp
index ed363c85906..cc755dcc040 100644
--- a/engines/scumm/charset.cpp
+++ b/engines/scumm/charset.cpp
@@ -1742,10 +1742,8 @@ void CharsetRendererMac::printChar(int chr, bool ignoreCharsetMask) {
 		// and light gray note names, because apparently the game never
 		// changes them back to light gray once the draft is done?
 
-		if (_vm->_game.id == GID_LOOM) {
-			if (chr >= 16 && chr <= 23 && _color == 7)
-				color = 15;
-		}
+		if (chr >= 16 && chr <= 23 && _color == 7)
+			color = 15;
 	}
 
 	bool drawToTextBox = (vs->number == kTextVirtScreen && _vm->_game.id == GID_INDY3);
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 9bedbc3bb6a..3cdf1742007 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -3285,12 +3285,9 @@ void ScummEngine_v3::scummLoop_handleSaveLoad() {
 				// as terminateSaveMenuScript() will be gracefully handling that)
 				//
 				// Fixes bug #3362: MANIACNES: Music Doesn't Start On Load Game
-				if (_game.platform == Common::kPlatformNES) {
-					runScript(5, 0, 0, nullptr);
-					if (VAR(224))
-						_sound->startSound(VAR(224));
-				}
-
+				runScript(5, 0, 0, nullptr);
+				if (VAR(224))
+					_sound->startSound(VAR(224));
 			} else if (_game.platform != Common::kPlatformMacintosh) {
 				// MM and ZAK (v1/2)
 				int saveLoadRoom = 50;