[Scummvm-git-logs] scummvm master -> 258d61f63aab6982ed341205bd8cdf04e0e59114

AndywinXp noreply at scummvm.org
Sat Sep 30 07:11:09 UTC 2023


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:
258d61f63a SWORD1: Remove code altering live_list[]


Commit: 258d61f63aab6982ed341205bd8cdf04e0e59114
    https://github.com/scummvm/scummvm/commit/258d61f63aab6982ed341205bd8cdf04e0e59114
Author: AndywinXp (andywinxp at gmail.com)
Date: 2023-09-30T09:11:03+02:00

Commit Message:
SWORD1: Remove code altering live_list[]

What was I thinking when I added this?!
This code unconditionally enters sections, with the risk
of them being active throughout the whole game, without
ever being closed. I sure love hearing the Irish Pub fiddle
player from within the ending scene with the Neo-Templars. :-)

Changed paths:
    engines/sword1/logic.cpp


diff --git a/engines/sword1/logic.cpp b/engines/sword1/logic.cpp
index 1e9dc750d52..176d6094621 100644
--- a/engines/sword1/logic.cpp
+++ b/engines/sword1/logic.cpp
@@ -1460,9 +1460,6 @@ int Logic::fnWalk(Object *cpt, int32 id, int32 x, int32 y, int32 dir, int32 stan
 					(target != FLOOR_63) && (target != ROOF_63) && (target != GUARD_ROOF_63) &&
 					(target != LEFT_TREE_POINTER_71) && (target != RIGHT_TREE_POINTER_71)) {
 
-					if (!_objMan->sectionAlive(_scriptVars[CLICK_ID] / ITM_PER_SEC))
-						_objMan->megaEntering(_scriptVars[CLICK_ID] / ITM_PER_SEC);
-
 					target = _objMan->fetchObject(_scriptVars[CLICK_ID])->o_mouse_on;
 					if ((target >= SCR_exit0) && (target <= SCR_exit9)) {
 						fnStandAt(cpt, id, x, y, dir, stance, 0, 0);




More information about the Scummvm-git-logs mailing list