diff options
| author | Malkierian <malkierian@gmail.com> | 2024-11-29 11:38:40 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-11-29 11:38:40 -0700 |
| commit | f7378a9f76dd2e17dddd3160c9e7e36ae89fb0fd (patch) | |
| tree | 10647e8c49d0d304f30920de3cb810374f23613e /soh/src/code/z_parameter.c | |
| parent | a92c08dea1948481647a1d1061175162edd431f4 (diff) | |
Cosmetics cleanup (#4587)
* Convert defaultColor from ImVec4 to Color_RGBA8.
Convert defaultColor's ints to floats when being applied to currentColor in the macro.
* Address previous cleanup comments.
Surround `Message` tab in an advanced check.
* Resolve warnings and cleanup whitespace/formatting.
* Make Color_RGBA8 constructing function because... platform differences...
* Function name clarification.
* Remove default color conversion, reference default colors directly in CosmeticOption initialization.
Diffstat (limited to 'soh/src/code/z_parameter.c')
| -rw-r--r-- | soh/src/code/z_parameter.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/soh/src/code/z_parameter.c b/soh/src/code/z_parameter.c index 754e40ae2..84c71c83b 100644 --- a/soh/src/code/z_parameter.c +++ b/soh/src/code/z_parameter.c @@ -3390,6 +3390,8 @@ void Interface_UpdateMagicBar(PlayState* play) { gSaveContext.magicState = MAGIC_STATE_IDLE; if (CVarGetInteger(CVAR_COSMETIC("Consumable.MagicBorder.Changed"), 0)) { sMagicBorder = CVarGetColor24(CVAR_COSMETIC("Consumable.MagicBorder.Value"), sMagicBorder_ori); + } else { + sMagicBorder = sMagicBorder_ori; } break; } |