Fix stale storedObjId [OSH token crash]

When spawning a model, the storedObjId should always be updated even if the object is already loaded.
Z3DR · Aug 5, 2024 · 7946ead · 7946ead
1 parent d3e352f
commit 7946ead
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/code/source/rnd/models.cpp b/code/source/rnd/models.cpp
@@ -60,9 +60,12 @@ namespace rnd {
   void Model_GetObjectBankIndex(Model* model, game::act::Actor* actor, game::GlobalContext* globalCtx) {
     s32 objectBankIdx = ExtendedObject_GetIndex(&globalCtx->object_context, model->itemRow->objectId);
     if (objectBankIdx < 0) {
-      storedObjId = model->itemRow->objectId;
       objectBankIdx = ExtendedObject_Spawn(&globalCtx->object_context, model->itemRow->objectId);
     }
+    storedObjId = model->itemRow->objectId;
+#if defined ENABLE_DEBUG || defined DEBUG_PRINT
+    rnd::util::Print("%s: storedObjId is %#04x\n", __func__, storedObjId);
+#endif
     model->objectBankIdx = objectBankIdx;
   }