Changeset 29c35a6 in Readingame

Timestamp:

May 1, 2024, 11:38:53 AM (8 weeks ago)

Author:

PulkoMandy <pulkomandy@…>

Branches:

main

Parents:

c52dd7b

Message:

MSGGEN can be empty

This was resulting in an off by one error.

Visite au Zoo is now fully playable.

File:

• main.cpp (modified) (2 diffs)

main.cpp

@@ -1345 +1345 @@
 }
 
-void ReadRoomsMessages(BFile& f)
+void ReadRoomsMessages(BFile& f, int& roomNumber)
 {
-        static int roomNumber = 0;
-
         off_t fileSize;
         f.GetSize(&fileSize);
@@ -1466 +1464 @@
         ReadRoomsScripts(condUltiFile);
 
-        ReadRoomsMessages(msgGeneralFile);
-        ReadRoomsMessages(msgRoomsFile);
+        int roomNumber = 0;
+        ReadRoomsMessages(msgGeneralFile, roomNumber);
+
+        if (roomNumber > 1) {
+                printf("WARNING: more than 1 room in MSGGEN\n");
+        }
+
+        if (roomNumber == 0) {
+                // No MSGGEN, but leave an empty slot for it so that room numbers are not offset.
+                roomNumber++;
+        }
+
+        ReadRoomsMessages(msgRoomsFile, roomNumber);
 
         // TODO how many variables are there?