[Scummvm-git-logs] scummvm master -> 14983f01a40302a7a7493edec03b72523b973577

[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:
14983f01a4 SCUMM: Exclude Loom demos from recent fire animation enhancement


Commit: 14983f01a40302a7a7493edec03b72523b973577
    https://github.com/scummvm/scummvm/commit/14983f01a40302a7a7493edec03b72523b973577
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2022-06-15T07:23:39+02:00

Commit Message:
SCUMM: Exclude Loom demos from recent fire animation enhancement

Not only do the demos use a different script number, they don't even
have the bug we're working around!

Changed paths:
    engines/scumm/script.cpp


diff --git a/engines/scumm/script.cpp b/engines/scumm/script.cpp
index 0b4ec9342cc..631e79c76bf 100644
--- a/engines/scumm/script.cpp
+++ b/engines/scumm/script.cpp
@@ -677,7 +677,7 @@ void ScummEngine::writeVar(uint var, int value) {
 		// throughout the intro. This does not apply to the VGA talkie
 		// version, because there the fire isn't animated.
 
-		else if (_game.id == GID_LOOM && _game.version < 4 && vm.slot[_currentScript].number == 44 && var == VAR_TIMER_NEXT && _enableEnhancements) {
+		else if (_game.id == GID_LOOM && !(_game.features & GF_DEMO) && _game.version < 4 && vm.slot[_currentScript].number == 44 && var == VAR_TIMER_NEXT && _enableEnhancements) {
 			Actor *a = derefActorSafe(4, "writeVar");
 			if (a) {
 				a->setAnimSpeed((value == 0) ? 6 : 0);