[Scummvm-git-logs] scummvm master -> 40d4eec6664caf57f6dd633e71474207bf42265f

[sluicebox]

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:
40d4eec666 AGI: PREAGI: Fix TROLL array size


Commit: 40d4eec6664caf57f6dd633e71474207bf42265f
    https://github.com/scummvm/scummvm/commit/40d4eec6664caf57f6dd633e71474207bf42265f
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2024-12-31T02:26:45-08:00

Commit Message:
AGI: PREAGI: Fix TROLL array size

TrollEngine::_nonTrollRooms was declared with a data offset instead
of a room count, making it a 15,609 byte array instead of 9.

Changed paths:
    engines/agi/preagi/troll.cpp
    engines/agi/preagi/troll.h


diff --git a/engines/agi/preagi/troll.cpp b/engines/agi/preagi/troll.cpp
index 1081a6dc9dd..502dc47ce36 100644
--- a/engines/agi/preagi/troll.cpp
+++ b/engines/agi/preagi/troll.cpp
@@ -698,7 +698,7 @@ void TrollEngine::fillOffsets() {
 		_items[i].name[15] = 0;
 	}
 
-	for (i = 0; i < IDO_TRO_NONTROLLROOMS; i++)
+	for (i = 0; i < IDI_TRO_NUM_NONTROLL; i++)
 		_nonTrollRooms[i] = _gameData[IDO_TRO_NONTROLLROOMS + i];
 
 	_tunes[0] = 0x3BFD;
diff --git a/engines/agi/preagi/troll.h b/engines/agi/preagi/troll.h
index 7c4c765c4c8..8dff12de243 100644
--- a/engines/agi/preagi/troll.h
+++ b/engines/agi/preagi/troll.h
@@ -214,7 +214,7 @@ private:
 	int _options[IDI_TRO_NUM_OPTIONS];
 	Item _items[IDI_TRO_MAX_TREASURE];
 	int _roomConnects[IDI_TRO_NUM_OPTIONS];
-	int _nonTrollRooms[IDO_TRO_NONTROLLROOMS];
+	int _nonTrollRooms[IDI_TRO_NUM_NONTROLL];
 
 	int _tunes[6];
 };