[Scummvm-git-logs] scummvm branch-3-0 -> cfb2b1c9041dbabcbfe29ea477a9512cc9e7b8db

[Strangerke]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .

Summary:
cfb2b1c904 M4: Riddle - Fix for #16085 : Variant paths not properly loaded


Commit: cfb2b1c9041dbabcbfe29ea477a9512cc9e7b8db
    https://github.com/scummvm/scummvm/commit/cfb2b1c9041dbabcbfe29ea477a9512cc9e7b8db
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2026-01-05T11:52:30+01:00

Commit Message:
M4: Riddle - Fix for #16085 : Variant paths not properly loaded

Changed paths:
    engines/m4/adv_r/adv_file.cpp


diff --git a/engines/m4/adv_r/adv_file.cpp b/engines/m4/adv_r/adv_file.cpp
index e4f835c3823..c372d9b180f 100644
--- a/engines/m4/adv_r/adv_file.cpp
+++ b/engines/m4/adv_r/adv_file.cpp
@@ -215,15 +215,22 @@ bool kernel_load_variant(const char *variant) {
 
 	// TODO: This is just copied from the room loading code,
 	// rather than disassembling the reset of the original method.
-	// Need to determine whether this is correct or not
+	// Need to determine whether this is correct or not,
+	// then modified to clean screenCodeBuff and the edges.
+
 	GrBuff *scr_orig_data = load_codes(&code_file);
 
 	code_file.close();
 
 	if (scr_orig_data) {
+		_G(screenCodeBuff)->release();
+		free _G(screenCodeBuff);
+		RestoreEdgeList(nullptr);
+
 		Buffer *scr_orig_data_buffer = scr_orig_data->get_buffer();
 		RestoreEdgeList(scr_orig_data_buffer);
-		scr_orig_data->release();
+		
+		_G(screenCodeBuff) = scr_orig_data;
 	}
 
 	return true;