[Scummvm-git-logs] scummvm master -> 968ba35f005829fbab7b69f646701bfdd49bdddc

[dreammaster]

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:
968ba35f00 M4: RIDDLE: Fixes for room 203 parser


Commit: 968ba35f005829fbab7b69f646701bfdd49bdddc
    https://github.com/scummvm/scummvm/commit/968ba35f005829fbab7b69f646701bfdd49bdddc
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-11-09T21:55:16-08:00

Commit Message:
M4: RIDDLE: Fixes for room 203 parser

Changed paths:
    engines/m4/riddle/rooms/section2/room203.cpp


diff --git a/engines/m4/riddle/rooms/section2/room203.cpp b/engines/m4/riddle/rooms/section2/room203.cpp
index dbfcbe078ce..a182c839fd9 100644
--- a/engines/m4/riddle/rooms/section2/room203.cpp
+++ b/engines/m4/riddle/rooms/section2/room203.cpp
@@ -2707,7 +2707,8 @@ void Room203::parser() {
 		playSound("203r07", _G(kernel).trigger);
 	} else if (lookFlag && player_said("SOLDIER'S HELMET ")) {
 		digi_play("203r09a", 1);
-	} else if (lookFlag && HAS("SOLDIER'S HELMET") && !_G(flags)[V060]) {
+	} else if (lookFlag && player_said("SOLDIER'S HELMET") &&
+			!inv_player_has("SOLDIER'S HELMET") && !_G(flags)[V060]) {
 		_G(flags)[V051] = 1;
 		player_set_commands_allowed(false);
 		playSound("203r09", _G(kernel).trigger);
@@ -3137,7 +3138,7 @@ void Room203::parser() {
 
 			sketchInJournal("203r53");
 		}
-	} else if (lookFlag && inv_player_has(_G(player).noun)) {
+	} else if (lookFlag && !inv_player_has(_G(player).noun)) {
 		switch (_G(kernel).trigger) {
 		case -1:
 			if (_G(flags)[V050]) {