[Scummvm-git-logs] scummvm master -> 15217dbbf9ab83c4e3942a55e21ded7eec788323

[Strangerke]

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:
15217dbbf9 M4: RIDDLE: Simplify the first "player_said()" reversed in room 801


Commit: 15217dbbf9ab83c4e3942a55e21ded7eec788323
    https://github.com/scummvm/scummvm/commit/15217dbbf9ab83c4e3942a55e21ded7eec788323
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2024-10-12T01:15:16+01:00

Commit Message:
M4: RIDDLE: Simplify the first "player_said()" reversed in room 801

Changed paths:
    engines/m4/riddle/rooms/section8/room801.cpp


diff --git a/engines/m4/riddle/rooms/section8/room801.cpp b/engines/m4/riddle/rooms/section8/room801.cpp
index 50ef72ce602..5b5c20148e7 100644
--- a/engines/m4/riddle/rooms/section8/room801.cpp
+++ b/engines/m4/riddle/rooms/section8/room801.cpp
@@ -144,26 +144,26 @@ void Room801::init() {
 }
 
 void Room801::pre_parser() {
-	player_said("take", nullptr, nullptr);
+	player_said("take");
 	bool lookCheck = false;
-	if (player_said("look", nullptr, nullptr) || player_said("look at", nullptr, nullptr)) {
+	if (player_said("look") || player_said("look at")) {
 		lookCheck = true;
 	}
 
-	if (player_said("push", nullptr, nullptr) || player_said("pull", nullptr, nullptr)
-		|| player_said("gear", nullptr, nullptr) || player_said("open", nullptr, nullptr)) {
-		player_said("close", nullptr, nullptr);
+	if (player_said("push") || player_said("pull")
+		|| player_said("gear") || player_said("open")) {
+		player_said("close");
 	}
 
-	player_said("go", nullptr, nullptr);
-	if (lookCheck && player_said("farm", nullptr, nullptr)) {
+	player_said("go");
+	if (lookCheck && player_said("farm")) {
 		digi_play("801R23", 1, 255, -1, -1);
 		_G(player).need_to_walk = false;
 		_G(player).ready_to_walk = true;
 		_G(player).waiting_for_walk = false;
 	}
 
-	if (lookCheck && player_said(" ", nullptr, nullptr)) {
+	if (lookCheck && player_said(" ")) {
 		_G(player).need_to_walk = false;
 		_G(player).ready_to_walk = true;
 		_G(player).waiting_for_walk = false;
@@ -177,27 +177,27 @@ void Room801::parser() {
 	bool talkFl = false;
 	bool goFl = false;
 
-	if (player_said("look", nullptr, nullptr) || player_said("look at", nullptr, nullptr)) {
+	if (player_said("look") || player_said("look at")) {
 		lookFl = true;
 	}
 
-	if (player_said("talk", nullptr, nullptr) || player_said("talk TO", nullptr, nullptr)) {
+	if (player_said("talk") || player_said("talk TO")) {
 		talkFl = true;
 	}
 
-	if (player_said("take", nullptr, nullptr)) {
+	if (player_said("take")) {
 		takeFl = true;
 	}
 
-	if (player_said("gear", nullptr, nullptr)) {
+	if (player_said("gear")) {
 		gearFl = true;
 	}
 
-	if (player_said("go", nullptr, nullptr)) {
+	if (player_said("go")) {
 		goFl = true;
 	}
 
-	if (player_said("conv801a", nullptr, nullptr)) {
+	if (player_said("conv801a")) {
 		room801_conv801a();
 	}