[Scummvm-git-logs] scummvm master -> e7384ec53ac38991e53d2edf35768ae84aa29102

[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:
e7384ec53a M4: Fix crash talking to mayor in room 105


Commit: e7384ec53ac38991e53d2edf35768ae84aa29102
    https://github.com/scummvm/scummvm/commit/e7384ec53ac38991e53d2edf35768ae84aa29102
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-02-03T11:05:48-08:00

Commit Message:
M4: Fix crash talking to mayor in room 105

Changed paths:
    engines/m4/burger/rooms/section1/room105.cpp
    engines/m4/wscript/ws_load.cpp


diff --git a/engines/m4/burger/rooms/section1/room105.cpp b/engines/m4/burger/rooms/section1/room105.cpp
index 60c27e5c1bf..282cdb13bba 100644
--- a/engines/m4/burger/rooms/section1/room105.cpp
+++ b/engines/m4/burger/rooms/section1/room105.cpp
@@ -270,6 +270,11 @@ void Room105::init() {
 	_series5 = 0;
 	digi_preload("105_001");
 
+	Common::fill(&_series1[0], &_series1[12], -1);
+	Common::fill(&_series2[0], &_series2[4], -1);
+	Common::fill(&_series3[0], &_series3[12], -1);
+	Common::fill(&_series4[0], &_series4[5], -1);
+
 	if (_G(flags)[V112]) {
 		series_play("105do01", 0xf00, 0, -1, 600, -1, 100, 0, 0, 0, 0);
 		_elgusShould = 59;
@@ -1716,7 +1721,7 @@ void Room105::loadAssets3() {
 	};
 
 	for (int i = 0; i < 12; ++i)
-		_series1[i] = series_load(NAMES[i]);
+		_series3[i] = series_load(NAMES[i]);
 
 	series_load("105eg10");
 	series_load("105eg10s");
diff --git a/engines/m4/wscript/ws_load.cpp b/engines/m4/wscript/ws_load.cpp
index 6dabb92ae97..5f33b8def43 100644
--- a/engines/m4/wscript/ws_load.cpp
+++ b/engines/m4/wscript/ws_load.cpp
@@ -143,6 +143,7 @@ bool InitWSAssets() {
 
 bool ClearWSAssets(uint32 assetType, int32 minHash, int32 maxHash) {
 	int32 i;
+	assert(maxHash >= minHash);
 
 	if (!_GWS(wsloaderInitialized)) {
 		return false;