From 6f8544273e3691228fdfe85f42956ed9bae5ee79 Mon Sep 17 00:00:00 2001 From: Caladius Date: Fri, 29 Nov 2024 08:55:34 -0500 Subject: [PATCH] Update from Suggestions --- soh/assets/soh_assets.h | 12 ++++----- .../Enhancements/TimeDisplay/TimeDisplay.cpp | 18 ++++++------- .../Enhancements/TimeDisplay/TimeDisplay.h | 2 +- soh/src/code/z_parameter.c | 26 +++++++++---------- 4 files changed, 28 insertions(+), 30 deletions(-) diff --git a/soh/assets/soh_assets.h b/soh/assets/soh_assets.h index 93575c2a025..568a8796320 100644 --- a/soh/assets/soh_assets.h +++ b/soh/assets/soh_assets.h @@ -106,14 +106,14 @@ static const ALIGN_ASSET(2) char gSplitEntranceTex[] = dgSplitEntrance; #define dgBossSoul "__OTR__textures/parameter_static/gBossSoul" static const ALIGN_ASSET(2) char gBossSoulTex[] = dgBossSoul; -#define dgMoonIco "__OTR__textures/parameter_static/gMoon" -static const ALIGN_ASSET(2) char gMoonIcoTex[] = dgMoonIco; +#define dgMoonIcon "__OTR__textures/parameter_static/gMoon" +static const ALIGN_ASSET(2) char gMoonIconTex[] = dgMoonIcon; -#define dgSunIco "__OTR__textures/parameter_static/gSun" -static const ALIGN_ASSET(2) char gSunIcoTex[] = dgSunIco; +#define dgSunIcon "__OTR__textures/parameter_static/gSun" +static const ALIGN_ASSET(2) char gSunIconTex[] = dgSunIcon; -#define dgNaviIco "__OTR__textures/parameter_static/gNavi" -static const ALIGN_ASSET(2) char gNaviIcoTex[] = dgNaviIco; +#define dgNaviIcon "__OTR__textures/parameter_static/gNavi" +static const ALIGN_ASSET(2) char gNaviIconTex[] = dgNaviIcon; #define dgFileSelMQButtonTex "__OTR__textures/title_static/gFileSelMQButtonTex" static const ALIGN_ASSET(2) char gFileSelMQButtonTex[] = dgFileSelMQButtonTex; diff --git a/soh/soh/Enhancements/TimeDisplay/TimeDisplay.cpp b/soh/soh/Enhancements/TimeDisplay/TimeDisplay.cpp index 25aee160342..d3b93ba5b84 100644 --- a/soh/soh/Enhancements/TimeDisplay/TimeDisplay.cpp +++ b/soh/soh/Enhancements/TimeDisplay/TimeDisplay.cpp @@ -27,7 +27,7 @@ ImVec4 textColor = ImVec4(1.0f, 1.0f, 1.0f, 1.0f); #define COLOR_LIGHT_GREEN ImVec4(0.52f, 1.0f, 0.23f, 1.0f) #define COLOR_GREY ImVec4(0.78f, 0.78f, 0.78f, 1.0f) -std::vector> digitList = { +const static std::vector> digitList = { { "DIGIT_0_TEXTURE", gCounterDigit0Tex }, { "DIGIT_1_TEXTURE", gCounterDigit1Tex }, { "DIGIT_2_TEXTURE", gCounterDigit2Tex }, @@ -41,14 +41,14 @@ std::vector> digitList = { { "COLON_TEXTURE", gCounterColonTex }, }; -std::vector timeDisplayList = { +const std::vector timeDisplayList = { { DISPLAY_IN_GAME_TIMER, "Display Gameplay Timer", CVAR_ENHANCEMENT("TimeDisplay.Timers.InGameTimer") }, { DISPLAY_TIME_OF_DAY, "Display Time of Day", CVAR_ENHANCEMENT("TimeDisplay.Timers.TimeofDay") }, { DISPLAY_CONDITIONAL_TIMER, "Display Conditional Timer", CVAR_ENHANCEMENT("TimeDisplay.Timers.HotWater") }, { DISPLAY_NAVI_TIMER, "Display Navi Timer", CVAR_ENHANCEMENT("TimeDisplay.Timers.NaviTimer") } }; -std::vector activeTimers; +static std::vector activeTimers; std::string convertDayTime(uint32_t dayTime) { uint32_t totalSeconds = 24 * 60 * 60; @@ -80,7 +80,7 @@ std::string formatTimeDisplay(uint32_t value) { return fmt::format("{}:{:0>2}:{:0>2}.{}", hh, mm, ss, ds); } -void TimeDisplayGetTimer(uint32_t timeID) { +static void TimeDisplayGetTimer(uint32_t timeID) { timeDisplayTime = ""; textureDisplay = 0; textColor = COLOR_WHITE; @@ -197,7 +197,7 @@ void TimeDisplayWindow::Draw() { if (textToDecode[i] == ':' || textToDecode[i] == '.') { textureIndex = 10; } else { - textureIndex = textToDecode[i] - 48; + textureIndex = textToDecode[i] - '0'; } if (textToDecode[i] == '.') { ImGui::SetCursorPosY(ImGui::GetCursorPosY() + (8.0f * fontScale)); @@ -232,7 +232,7 @@ void TimeDisplayInitSettings() { } } -void TimeDisplayInitTimers() { +static void TimeDisplayInitTimers() { for (auto& update : timeDisplayList) { if (CVarGetInteger(update.timeEnable, 0)) { activeTimers.push_back(update); @@ -242,9 +242,9 @@ void TimeDisplayInitTimers() { void TimeDisplayWindow::InitElement() { Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadGuiTexture("GAMEPLAY_TIMER", gClockIconTex, ImVec4(1, 1, 1, 1)); - Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadGuiTexture("DAY_TIME_TIMER", gSunIcoTex, ImVec4(1, 1, 1, 1)); - Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadGuiTexture("NIGHT_TIME_TIMER", gMoonIcoTex, ImVec4(1, 1, 1, 1)); - Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadGuiTexture("NAVI_TIMER", gNaviIcoTex, ImVec4(1, 1, 1, 1)); + Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadGuiTexture("DAY_TIME_TIMER", gSunIconTex, ImVec4(1, 1, 1, 1)); + Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadGuiTexture("NIGHT_TIME_TIMER", gMoonIconTex, ImVec4(1, 1, 1, 1)); + Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadGuiTexture("NAVI_TIMER", gNaviIconTex, ImVec4(1, 1, 1, 1)); for (auto& load : digitList) { Ship::Context::GetInstance()->GetWindow()->GetGui()->LoadGuiTexture(load.first.c_str(), load.second, ImVec4(1, 1, 1, 1)); diff --git a/soh/soh/Enhancements/TimeDisplay/TimeDisplay.h b/soh/soh/Enhancements/TimeDisplay/TimeDisplay.h index 8b18f27b9da..0d212f1e2d1 100644 --- a/soh/soh/Enhancements/TimeDisplay/TimeDisplay.h +++ b/soh/soh/Enhancements/TimeDisplay/TimeDisplay.h @@ -26,4 +26,4 @@ typedef struct { const char* timeEnable; } TimeObject; -extern std::vector timeDisplayList; \ No newline at end of file +extern const std::vector timeDisplayList; \ No newline at end of file diff --git a/soh/src/code/z_parameter.c b/soh/src/code/z_parameter.c index f05ccc17248..a7cbf644daf 100644 --- a/soh/src/code/z_parameter.c +++ b/soh/src/code/z_parameter.c @@ -6056,22 +6056,20 @@ void Interface_Draw(PlayState* play) { } svar5 = OTRGetRectDimensionFromLeftEdge(gSaveContext.timerX[svar6]+X_Margins_Timer); svar2 = gSaveContext.timerY[svar6]; - if (CVarGetInteger(CVAR_COSMETIC("HUD.Timers.PosType"), 0) == 4 || + if (CVarGetInteger(CVAR_COSMETIC("HUD.Timers.PosType"), 0) == 4 || // Hidden (CVarGetInteger(CVAR_WINDOW("TimeDisplayEnabled"), 0) && - CVarGetInteger(CVAR_ENHANCEMENT("TimeDisplay.Timers.HotWater"), 0) == 1)) { + CVarGetInteger(CVAR_ENHANCEMENT("TimeDisplay.Timers.HotWater"), 0))) { svar5 = -9999; - } else { - if (CVarGetInteger(CVAR_COSMETIC("HUD.Timers.PosType"), 0) != 0) { - svar2 = (CVarGetInteger(CVAR_COSMETIC("HUD.Timers.PosY"), 0)); - if (CVarGetInteger(CVAR_COSMETIC("HUD.Timers.PosType"), 0) == 1) {//Anchor Left - if (CVarGetInteger(CVAR_COSMETIC("HUD.Timers.UseMargins"), 0) != 0) {X_Margins_Timer = Left_HUD_Margin;}; - svar5 = OTRGetRectDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.Timers.PosX"), 0)+X_Margins_Timer); - } else if (CVarGetInteger(CVAR_COSMETIC("HUD.Timers.PosType"), 0) == 2) {//Anchor Right - if (CVarGetInteger(CVAR_COSMETIC("HUD.Timers.UseMargins"), 0) != 0) {X_Margins_Timer = Right_HUD_Margin;}; - svar5 = OTRGetRectDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.Timers.PosX"), 0)+X_Margins_Timer); - } else if (CVarGetInteger(CVAR_COSMETIC("HUD.Timers.PosType"), 0) == 3) {//Anchor None - svar5 = CVarGetInteger(CVAR_COSMETIC("HUD.Timers.PosX"), 0)+204+X_Margins_Timer; - } + } else if (CVarGetInteger(CVAR_COSMETIC("HUD.Timers.PosType"), 0) != 0) { + svar2 = (CVarGetInteger(CVAR_COSMETIC("HUD.Timers.PosY"), 0)); + if (CVarGetInteger(CVAR_COSMETIC("HUD.Timers.PosType"), 0) == 1) {//Anchor Left + if (CVarGetInteger(CVAR_COSMETIC("HUD.Timers.UseMargins"), 0) != 0) {X_Margins_Timer = Left_HUD_Margin;}; + svar5 = OTRGetRectDimensionFromLeftEdge(CVarGetInteger(CVAR_COSMETIC("HUD.Timers.PosX"), 0)+X_Margins_Timer); + } else if (CVarGetInteger(CVAR_COSMETIC("HUD.Timers.PosType"), 0) == 2) {//Anchor Right + if (CVarGetInteger(CVAR_COSMETIC("HUD.Timers.UseMargins"), 0) != 0) {X_Margins_Timer = Right_HUD_Margin;}; + svar5 = OTRGetRectDimensionFromRightEdge(CVarGetInteger(CVAR_COSMETIC("HUD.Timers.PosX"), 0)+X_Margins_Timer); + } else if (CVarGetInteger(CVAR_COSMETIC("HUD.Timers.PosType"), 0) == 3) {//Anchor None + svar5 = CVarGetInteger(CVAR_COSMETIC("HUD.Timers.PosX"), 0)+204+X_Margins_Timer; } }