Speedmeter OK (#1393)

* Match

* data + bss

* x

* Small cleanup

* maxVal

* gUnkTimeAcc

* SET_FULLSCREEN_VIEWPORT_HIRES

* Update permuter settings

* SET_FULLSCREEN_VIEWPORT_DYNAMIC

1 files changed, 9 insertions, 9 deletions

diff --git a/src/code/game.c b/src/code/game.c
index 4f2df63cd..237783319 100644
--- a/src/code/game.c
+++ b/src/code/game.c
@@ -164,11 +164,11 @@ void GameState_InitArena(GameState* gameState, size_t size) {
     void* buf = GameAlloc_Malloc(alloc, size);
 
     if (buf) {
-        THA_Init(&gameState->heap, buf, size);
+        THA_Init(&gameState->tha, buf, size);
         return;
     }
 
-    THA_Init(&gameState->heap, NULL, 0);
+    THA_Init(&gameState->tha, NULL, 0);
     _dbg_hungup("../game.c", 1035);
 }
 
@@ -178,9 +178,9 @@ void GameState_Realloc(GameState* gameState, size_t size) {
     size_t systemMaxFree;
     size_t bytesFree;
     size_t bytesAllocated;
-    void* heapStart = gameState->heap.start;
+    void* heapStart = gameState->tha.start;
 
-    THA_Destroy(&gameState->heap);
+    THA_Destroy(&gameState->tha);
     GameAlloc_Free(alloc, heapStart);
     SystemArena_GetSizes(&systemMaxFree, &bytesFree, &bytesAllocated);
     size = ((systemMaxFree - sizeof(ArenaNode)) < size) ? 0 : size;
@@ -190,9 +190,9 @@ void GameState_Realloc(GameState* gameState, size_t size) {
 
     gameArena = GameAlloc_Malloc(alloc, size);
     if (gameArena != NULL) {
-        THA_Init(&gameState->heap, gameArena, size);
+        THA_Init(&gameState->tha, gameArena, size);
     } else {
-        THA_Init(&gameState->heap, NULL, 0);
+        THA_Init(&gameState->tha, NULL, 0);
         _dbg_hungup("../game.c", 1074);
     }
 }
@@ -246,7 +246,7 @@ void GameState_Destroy(GameState* gameState) {
     VisZbuf_Destroy(&sGameVisZbuf);
     VisMono_Destroy(&sGameVisMono);
     ViMode_Destroy(&sGameViMode);
-    THA_Destroy(&gameState->heap);
+    THA_Destroy(&gameState->tha);
     GameAlloc_Cleanup(&gameState->alloc);
 }
 
@@ -263,11 +263,11 @@ u32 GameState_IsRunning(GameState* gameState) {
 }
 
 s32 GameState_GetArenaSize(GameState* gameState) {
-    return THA_GetRemaining(&gameState->heap);
+    return THA_GetRemaining(&gameState->tha);
 }
 
 s32 func_80173B48(GameState* gameState) {
-    s32 result = OS_CYCLES_TO_NSEC(gameState->framerateDivisor * sIrqMgrRetraceTime) - OS_CYCLES_TO_NSEC(gRDPTimeTotal);
+    s32 result = OS_CYCLES_TO_NSEC(gameState->framerateDivisor * gIrqMgrRetraceTime) - OS_CYCLES_TO_NSEC(gRDPTimeTotal);
 
     return result;
 }