output: move animated textures to module scope

This removes the global animated texture array and replaces with an accessor.
LostArtefacts · Jan 28, 2025 · 40729e6 · 40729e6
1 parent 19c66ba
commit 40729e6
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 7 deletions.
diff --git a/src/libtrx/game/level/common.c b/src/libtrx/game/level/common.c
@@ -444,9 +444,9 @@ void Level_ReadAnimatedTextureRanges(
     const int32_t num_ranges, VFILE *const file)
 {
     for (int32_t i = 0; i < num_ranges; i++) {
-        ANIMATED_TEXTURE_RANGE *const range = &g_AnimTextureRanges[i];
+        ANIMATED_TEXTURE_RANGE *const range = Output_GetAnimatedTextureRange(i);
         range->next_range =
-            i == num_ranges - 1 ? NULL : &g_AnimTextureRanges[i + 1];
+            i == num_ranges - 1 ? NULL : Output_GetAnimatedTextureRange(i + 1);
 
         // Level data is tied to the original logic in Output_AnimateTextures
         // and hence stores one less than the actual count here.

diff --git a/src/libtrx/game/output.c b/src/libtrx/game/output.c
@@ -13,6 +13,7 @@ typedef struct {
     int32_t shade;
 } COMMON_LIGHT;
 
+static ANIMATED_TEXTURE_RANGE *m_AnimTextureRanges = NULL;
 static int32_t m_DynamicLightCount = 0;
 static LIGHT m_DynamicLights[MAX_DYNAMIC_LIGHTS] = {};
 
@@ -105,16 +106,21 @@ static int32_t M_CalculateDynamicLight(
 
 void Output_InitialiseAnimatedTextures(const int32_t num_ranges)
 {
-    g_AnimTextureRanges = num_ranges == 0
+    m_AnimTextureRanges = num_ranges == 0
         ? NULL
         : GameBuf_Alloc(
               sizeof(ANIMATED_TEXTURE_RANGE) * num_ranges,
               GBUF_ANIMATED_TEXTURE_RANGES);
 }
 
+ANIMATED_TEXTURE_RANGE *Output_GetAnimatedTextureRange(const int32_t range_idx)
+{
+    return &m_AnimTextureRanges[range_idx];
+}
+
 void Output_CycleAnimatedTextures(void)
 {
-    const ANIMATED_TEXTURE_RANGE *range = g_AnimTextureRanges;
+    const ANIMATED_TEXTURE_RANGE *range = m_AnimTextureRanges;
     for (; range != NULL; range = range->next_range) {
         int32_t i = 0;
         const OBJECT_TEXTURE temp = g_ObjectTextures[range->textures[i]];

diff --git a/src/libtrx/include/libtrx/game/output.h b/src/libtrx/include/libtrx/game/output.h
@@ -37,6 +37,7 @@ extern int32_t Output_GetRoomLightShade(ROOM_LIGHT_MODE mode);
 extern void Output_LightRoomVertices(const ROOM *room);
 
 void Output_InitialiseAnimatedTextures(int32_t num_ranges);
+ANIMATED_TEXTURE_RANGE *Output_GetAnimatedTextureRange(int32_t range_idx);
 void Output_CycleAnimatedTextures(void);
 
 void Output_CalculateLight(XYZ_32 pos, int16_t room_num);

diff --git a/src/libtrx/include/libtrx/game/output/vars.h b/src/libtrx/include/libtrx/game/output/vars.h
@@ -6,4 +6,3 @@
 // TODO: change to output.c module scope
 extern OBJECT_TEXTURE g_ObjectTextures[MAX_OBJECT_TEXTURES];
 extern SPRITE_TEXTURE g_SpriteTextures[MAX_SPRITE_TEXTURES];
-extern ANIMATED_TEXTURE_RANGE *g_AnimTextureRanges;
diff --git a/src/tr1/global/vars.c b/src/tr1/global/vars.c
@@ -46,7 +46,6 @@ uint16_t *g_Overlap = NULL;
 int16_t *g_GroundZone[2] = { NULL };
 int16_t *g_GroundZone2[2] = { NULL };
 int16_t *g_FlyZone[2] = { NULL };
-ANIMATED_TEXTURE_RANGE *g_AnimTextureRanges = NULL;
 int16_t g_NumCineFrames = 0;
 int16_t g_CineFrame = -1;
 CINE_CAMERA *g_CineCamera = NULL;

diff --git a/src/tr2/global/vars.c b/src/tr2/global/vars.c
@@ -117,7 +117,6 @@ int32_t g_TexturePageCount;
 int32_t g_ObjectTextureCount;
 uint8_t g_LabTextureUVFlag[MAX_OBJECT_TEXTURES];
 int32_t g_NumCameras;
-ANIMATED_TEXTURE_RANGE *g_AnimTextureRanges = NULL;
 uint32_t *g_DemoData = NULL;
 char g_LevelFileName[256];
 uint16_t g_MusicTrackFlags[64];