Ticket #8161: clear-objects.diff

scummvm/scumm/object.cpp

@@ -410 +410 @@
         }
 }
 
+void Scumm::clearRoomObjects()
+{
+        int i;
+
+        if (_features & GF_SMALL_HEADER) {
+                for (i = 0; i < _numLocalObjects; i++) {
+                        _objs[i].obj_nr = 0;
+                }
+        } else {
+                // FIXME: Locking/FlObjects stuff?
+                for (i = 0; i < _numLocalObjects; i++) {
+                        if (_objs[i].obj_nr < 1)        // Optimise codepath
+                                continue;
+
+                        // Nuke all non-flObjects (flObjects are nuked in script.cpp)
+                        if (_objs[i].fl_object_index == 0) {
+                                _objs[i].obj_nr = 0;
+                        } else {
+                                // Nuke all unlocked flObjects
+                                if (!(res.flags[rtFlObject][_objs[i].fl_object_index] & RF_LOCK)) {
+                                        nukeResource(rtFlObject, _objs[i].fl_object_index);
+                                        _objs[i].obj_nr = 0;
+                                        _objs[i].fl_object_index = 0;
+                                } 
+                        }
+                }
+        }
+}
+
 void Scumm::loadRoomObjects()
 {
         int i, j;
@@ -432 +461 @@
         else
                 _numObjectsInRoom = READ_LE_UINT16(&(roomhdr->old.numObjects));
 
-        // Clear out old room objects (FIXME: Locking/FlObjects stuff?)
-        for (i = 0; i < _numLocalObjects; i++) {
-                if (_objs[i].obj_nr < 1)        // Optimise codepath
-                        continue;
-
-                // Nuke all non-flObjects (flObjects are nuked in script.cpp)
-                if (_objs[i].fl_object_index == 0) {
-                        _objs[i].obj_nr = 0;
-                } else {
-                        // Nuke all unlocked flObjects
-                        if (!(res.flags[rtFlObject][_objs[i].fl_object_index] & RF_LOCK)) {
-                                nukeResource(rtFlObject, _objs[i].fl_object_index);
-                                _objs[i].obj_nr = 0;
-                                _objs[i].fl_object_index = 0;
-                        } 
-                }
-        }
-
         if (_numObjectsInRoom == 0)
                 return;
 
@@ -544 +555 @@
         if (_numObjectsInRoom > _numLocalObjects)
                 error("More than %d objects in room %d", _numLocalObjects, _roomResource);
 
-        // Clear out old room objects
-        for (i = 0; i < _numLocalObjects; i++) {
-                _objs[i].obj_nr = 0;
-        }
-
         searchptr = room;
         for (i = 0; i < _numObjectsInRoom; i++) {
                 od = &_objs[findLocalObjectSlot()];

scummvm/scumm/scumm.h

@@ -532 +532 @@
         bool isResourceInUse(int type, int i);
         bool isResourceLoaded(int type, int index);
         void initRoomSubBlocks();
+        void clearRoomObjects();
         void loadRoomObjects();
         void loadRoomObjectsSmall();
         void readArrayFromIndexFile();

scummvm/scumm/scummvm.cpp

@@ -651 +651 @@
         if (room != 0)
                 ensureResourceLoaded(rtRoom, room);
 
+        clearRoomObjects();
+
         if (_currentRoom == 0) {
                 _ENCD_offs = _EXCD_offs = 0;
                 _numObjectsInRoom = 0;