Address PR comments

lahm86 · Jul 2, 2024 · 29c9cd3 · 29c9cd3
1 parent 3908d35
commit 29c9cd3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/src/game/level.c b/src/game/level.c
@@ -54,7 +54,7 @@ static bool Level_LoadTexturePages(MYFILE *fp);
 static bool Level_LoadFromFile(
     const char *filename, int32_t level_num, bool is_demo);
 static void Level_CompleteSetup(int32_t level_num);
-static void Level_CalculateMaxVertices(void);
+static size_t Level_CalculateMaxVertices(void);
 
 static bool Level_LoadFromFile(
     const char *filename, int32_t level_num, bool is_demo)
@@ -891,7 +891,9 @@ static void Level_CompleteSetup(int32_t level_num)
     // Configure enemies who carry and drop items
     Carrier_InitialiseLevel(level_num);
 
-    Level_CalculateMaxVertices();
+    size_t max_vertices = Level_CalculateMaxVertices();
+    LOG_INFO("Maximum vertices: %d", max_vertices);
+    Output_ReserveVertexBuffer(max_vertices);
 
     // Move the prepared texture pages into g_TexturePagePtrs.
     uint8_t *base = GameBuf_Alloc(
@@ -928,7 +930,7 @@ static void Level_CompleteSetup(int32_t level_num)
     Memory_FreePointer(&sample_sizes);
 }
 
-static void Level_CalculateMaxVertices(void)
+static size_t Level_CalculateMaxVertices(void)
 {
     size_t max_vertices = 0;
     for (int32_t i = 0; i < O_NUMBER_OF; i++) {
@@ -957,8 +959,7 @@ static void Level_CalculateMaxVertices(void)
         max_vertices = MAX(max_vertices, *g_RoomInfo[i].data);
     }
 
-    LOG_INFO("Maximum vertices: %d", max_vertices);
-    Output_ReserveVertexBuffer(max_vertices);
+    return max_vertices;
 }
 
 bool Level_Load(int level_num)

diff --git a/src/game/output.c b/src/game/output.c
@@ -78,7 +78,7 @@ static const int16_t *Output_CalcRoomVertices(const int16_t *obj_ptr);
 static int32_t Output_CalcFogShade(int32_t depth);
 static void Output_CalcWibbleTable(void);
 
-void Output_ReserveVertexBuffer(const size_t size)
+void Output_ReserveVertexBuffer(size_t size)
 {
     m_VBuf = GameBuf_Alloc(size * sizeof(PHD_VBUF), GBUF_VERTEX_BUFFER);
 }

diff --git a/src/game/output.h b/src/game/output.h
@@ -15,7 +15,7 @@ void Output_DownloadTextures(int page_count);
 RGBA_8888 Output_RGB2RGBA(const RGB_888 color);
 void Output_SetPalette(RGB_888 palette[256]);
 RGB_888 Output_GetPaletteColor(uint8_t idx);
-void Output_ReserveVertexBuffer(const size_t size);
+void Output_ReserveVertexBuffer(size_t size);
 
 int32_t Output_GetNearZ(void);
 int32_t Output_GetFarZ(void);