[Scummvm-git-logs] scummvm master -> 4b4d2ade59309c40e4b4c2533406d1e53e55d9ba

[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:
4b4d2ade59 M4: RIDDLE: Fix "Send radio" in dialog, in room 301


Commit: 4b4d2ade59309c40e4b4c2533406d1e53e55d9ba
    https://github.com/scummvm/scummvm/commit/4b4d2ade59309c40e4b4c2533406d1e53e55d9ba
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-02-23T09:10:01+01:00

Commit Message:
M4: RIDDLE: Fix "Send radio" in dialog, in room 301

Changed paths:
    engines/m4/adv_r/adv_been.cpp
    engines/m4/adv_r/conv_io.cpp
    engines/m4/riddle/rooms/section3/room301.cpp


diff --git a/engines/m4/adv_r/adv_been.cpp b/engines/m4/adv_r/adv_been.cpp
index 3c8df15e639..c7b71f1d916 100644
--- a/engines/m4/adv_r/adv_been.cpp
+++ b/engines/m4/adv_r/adv_been.cpp
@@ -87,14 +87,12 @@ bool player_enters_scene(int16 scene_num) {
 }
 
 void player_forgets_scene(int16 scene_num) {
-	int i, j;
-
 	// Check the list
-	for (i = 0; i < _G(scene_list).tail; i++) {
+	for (int i = 0; i < _G(scene_list).tail; i++) {
 		// Found a match
 		if (_G(scene_list).table[i] == scene_num) {
 			// Close the table
-			for (j = i; j < _G(scene_list).tail; j++) {
+			for (int j = i; j < _G(scene_list).tail; j++) {
 				_G(scene_list).table[j] = _G(scene_list).table[j + 1];
 			}
 
diff --git a/engines/m4/adv_r/conv_io.cpp b/engines/m4/adv_r/conv_io.cpp
index bf9c6886ae7..fe59bc60fc5 100644
--- a/engines/m4/adv_r/conv_io.cpp
+++ b/engines/m4/adv_r/conv_io.cpp
@@ -720,8 +720,6 @@ static void conv_set_disp_default(void) {
 }
 
 Conv *conv_load(const char *filename, int x1, int y1, int32 myTrigger, bool want_box) {
-	Conv *convers = nullptr;
-	int32 cSize = 0;
 	char fullpathname[MAX_FILENAME_SIZE];
 
 	term_message("conv_load");
@@ -755,20 +753,15 @@ Conv *conv_load(const char *filename, int x1, int y1, int32 myTrigger, bool want
 	if (!fp.exists()) {
 		// Force the file open
 		error_show(FL, 'CNVL', "couldn't conv_load %s", fullpathname);
-		conv_set_handle(nullptr);
-		convers = nullptr;
-		fp.close();
-
-		return nullptr;
 	}
 
-	cSize = fp.size();
+	int32 cSize = fp.size();
 
 	if (conv_get_handle() != nullptr) {
 		conv_unload();
 	}
 
-	convers = new Conv();
+	Conv *convers = new Conv();
 
 	if (!convers) {
 		conv_set_handle(nullptr);
diff --git a/engines/m4/riddle/rooms/section3/room301.cpp b/engines/m4/riddle/rooms/section3/room301.cpp
index c224a71add6..065478530f4 100644
--- a/engines/m4/riddle/rooms/section3/room301.cpp
+++ b/engines/m4/riddle/rooms/section3/room301.cpp
@@ -1054,8 +1054,6 @@ void Room301::conv301a() {
 			} else if (node != 13) {
 				_ripleyShould = 0;
 				conv_resume();
-			} else {
-				conv_resume();
 			}
 		} else {
 			conv_resume();