diff options
| author | Archez <Archez@users.noreply.github.com> | 2024-08-14 14:58:44 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-14 14:58:44 -0400 |
| commit | 9ceb5579b823d792e8f24ef3df772dade7700a17 (patch) | |
| tree | 5be48b79e72342bc2740155cf6cde960af5cbd79 /soh/src/code/game.c | |
| parent | f4d951aab8966add4e19a4151b41ff53d746d9f6 (diff) | |
| parent | 35b4da74cb90f12463c663c611bb7c3b29604a6b (diff) | |
Merge pull request #4294 from Archez/dev-develop-rando-merge
Merge develop -> develop-rando
Diffstat (limited to 'soh/src/code/game.c')
| -rw-r--r-- | soh/src/code/game.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/soh/src/code/game.c b/soh/src/code/game.c index f0988c7c3..e1974ed98 100644 --- a/soh/src/code/game.c +++ b/soh/src/code/game.c @@ -239,16 +239,15 @@ void GameState_ReqPadData(GameState* gameState) { PadMgr_RequestPadData(&gPadMgr, &gameState->input[0], 1); } -// OTRTODO -int fbTest = -1; +// Framebuffer for the Link preview on the pause menu equipment sub-screen +int gPauseLinkFrameBuffer = -1; void GameState_Update(GameState* gameState) { GraphicsContext* gfxCtx = gameState->gfxCtx; - if (fbTest == -1) - { - fbTest = gfx_create_framebuffer(64, 112, SCREEN_WIDTH, SCREEN_HEIGHT, true); - //fbTest = gfx_create_framebuffer(256, 512); + if (gPauseLinkFrameBuffer == -1) { + gPauseLinkFrameBuffer = gfx_create_framebuffer(PAUSE_EQUIP_PLAYER_WIDTH, PAUSE_EQUIP_PLAYER_HEIGHT, + PAUSE_EQUIP_PLAYER_WIDTH, PAUSE_EQUIP_PLAYER_HEIGHT, true); } GameState_SetFrameBuffer(gfxCtx); @@ -467,7 +466,7 @@ void GameState_Destroy(GameState* gameState) { // Performing clear skeletons before unload resources fixes an actor heap corruption crash due to the skeleton patching system. ResourceMgr_ClearSkeletons(); - if (CVarGetInteger(CVAR_ALT_ASSETS, 0)) { + if (ResourceMgr_IsAltAssetsEnabled()) { ResourceUnloadDirectory("alt/*"); gfx_texture_cache_clear(); } |