level: load objects and items in TRX

This moves the object setup and item initialisation calls to TRX in a
common routine.

src/libtrx/game/level/common.c

@@ -9,6 +9,7 @@
 #include "game/game_buf.h"
 #include "game/inject.h"
 #include "game/objects/common.h"
+#include "game/objects/setup.h"
 #include "game/output.h"
 #include "game/rooms.h"
 #include "game/shell.h"
@@ -822,3 +823,16 @@ void Level_LoadPalettes(LEVEL_INFO *const info)
     Memory_FreePointer(&info->palette.data_24);
     Memory_FreePointer(&info->palette.data_32);
 }
+
+void Level_LoadObjectsAndItems(void)
+{
+    // Object and item setup/initialisation must take place after injections
+    // have been processed. We also need to use a cached item count as
+    // individual initialisations may increment the total item count.
+    Object_SetupAllObjects();
+
+    const int32_t item_count = Item_GetLevelCount();
+    for (int32_t i = 0; i < item_count; i++) {
+        Item_Initialise(i);
+    }
+}

src/libtrx/include/libtrx/game/items/common.h

@@ -15,6 +15,7 @@ void Item_SetPrevActive(int16_t item_num);
 int32_t Item_GetDistance(const ITEM *item, const XYZ_32 *target);
 void Item_TakeDamage(ITEM *item, int16_t damage, bool hit_status);
 
+void Item_Initialise(int16_t item_num);
 int16_t Item_Create(void);
 int16_t Item_CreateLevelItem(void);
 void Item_Kill(int16_t item_num);

src/libtrx/include/libtrx/game/level/common.h

@@ -33,3 +33,4 @@ void Level_ReadItems(VFILE *file);
 
 void Level_LoadTexturePages(LEVEL_INFO *info);
 void Level_LoadPalettes(LEVEL_INFO *info);
+void Level_LoadObjectsAndItems(void);

src/tr1/game/objects/setup.h → src/libtrx/include/libtrx/game/objects/setup.h

@@ -1,5 +1,3 @@
 #pragma once
 
-#include "global/types.h"
-
 void Object_SetupAllObjects(void);

src/tr1/game/items.h

@@ -5,7 +5,6 @@
 #include <stdint.h>
 
 void Item_Control(void);
-void Item_Initialise(int16_t item_num);
 void Item_UpdateRoom(ITEM *item, int32_t height);
 int16_t Item_GetHeight(ITEM *item);
 int16_t Item_GetWaterHeight(ITEM *item);

src/tr1/game/level.c

@@ -14,7 +14,6 @@
 #include "game/music.h"
 #include "game/objects/creatures/mutant.h"
 #include "game/objects/creatures/pierre.h"
-#include "game/objects/setup.h"
 #include "game/output.h"
 #include "game/overlay.h"
 #include "game/random.h"
@@ -535,15 +534,7 @@ static void M_CompleteSetup(const GF_LEVEL *const level)
     // Must be called post-injection to allow for floor data changes.
     Stats_ObserveRoomsLoad();
 
-    // Must be called after all animations, meshes etc are initialised.
-    Object_SetupAllObjects();
-
-    // Must be called after Setup_AllObjects using the cached item count, as
-    // individual setups may increment the level item count.
-    const int32_t item_count = Item_GetLevelCount();
-    for (int32_t i = 0; i < item_count; i++) {
-        Item_Initialise(i);
-    }
+    Level_LoadObjectsAndItems();
 
     Lara_State_Initialise();
 

src/tr1/game/objects/setup.c

@@ -1,5 +1,3 @@
-#include "game/objects/setup.h"
-
 #include "game/lara/common.h"
 #include "game/lara/hair.h"
 #include "game/objects/common.h"

src/tr2/game/items.h

@@ -3,7 +3,6 @@
 #include "global/types.h"
 
 void Item_Control(void);
-void Item_Initialise(int16_t item_num);
 void Item_ClearKilled(void);
 void Item_ShiftCol(ITEM *item, COLL_INFO *coll);
 void Item_UpdateRoom(ITEM *item, int32_t height);

src/tr2/game/level.c

@@ -11,7 +11,6 @@
 #include "game/lara/control.h"
 #include "game/lot.h"
 #include "game/music.h"
-#include "game/objects/setup.h"
 #include "game/output.h"
 #include "game/overlay.h"
 #include "game/random.h"
@@ -382,8 +381,6 @@ static void M_LoadFromFile(const GF_LEVEL *const level)
     M_LoadAnimFrames(file);
 
     Level_ReadObjects(file);
-    Object_SetupAllObjects();
-
     Level_ReadStaticObjects(file);
     M_LoadTextures(file);
 
@@ -412,13 +409,7 @@ static void M_CompleteSetup(void)
 
     Level_LoadAnimFrames(&m_LevelInfo);
     Level_LoadAnimCommands();
-
-    // Must be called after Setup_AllObjects using the cached item count, as
-    // individual setups may increment the level item count.
-    const int32_t item_count = Item_GetLevelCount();
-    for (int32_t i = 0; i < item_count; i++) {
-        Item_Initialise(i);
-    }
+    Level_LoadObjectsAndItems();
 
     Level_LoadTexturePages(&m_LevelInfo);
     Level_LoadPalettes(&m_LevelInfo);

src/tr2/game/objects/setup.c

@@ -1,5 +1,3 @@
-#include "game/objects/setup.h"
-
 #include "game/lara/control.h"
 #include "game/lara/hair.h"
 #include "game/objects/common.h"
@@ -121,6 +119,9 @@
 
 static void M_SetupLara(void);
 static void M_SetupLaraExtra(void);
+static void M_SetupBaddyObjects(void);
+static void M_SetupTrapObjects(void);
+static void M_SetupGeneralObjects(void);
 
 static void M_SetupLara(void)
 {
@@ -143,7 +144,7 @@ static void M_SetupLaraExtra(void)
     obj->control = Lara_ControlExtra;
 }
 
-void Object_SetupBaddyObjects(void)
+static void M_SetupBaddyObjects(void)
 {
     M_SetupLara();
     M_SetupLaraExtra();
@@ -188,7 +189,7 @@ void Object_SetupBaddyObjects(void)
     Winston_Setup();
 }
 
-void Object_SetupTrapObjects(void)
+static void M_SetupTrapObjects(void)
 {
     Blade_Setup();
     DartEmitter_Setup();
@@ -223,7 +224,7 @@ void Object_SetupTrapObjects(void)
     TeethTrap_Setup();
 }
 
-void Object_SetupGeneralObjects(void)
+static void M_SetupGeneralObjects(void)
 {
     Boat_Setup();
     SkidooArmed_Setup();
@@ -396,9 +397,9 @@ void Object_SetupAllObjects(void)
         obj->intelligent = 0;
     }
 
-    Object_SetupBaddyObjects();
-    Object_SetupTrapObjects();
-    Object_SetupGeneralObjects();
+    M_SetupBaddyObjects();
+    M_SetupTrapObjects();
+    M_SetupGeneralObjects();
 
     Lara_Hair_Initialise();
 }