mirror of
https://github.com/HarbourMasters/Shipwright.git
synced 2024-12-12 19:22:23 -05:00
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.
This commit is contained in:
parent
a92c08dea1
commit
f7378a9f76
File diff suppressed because it is too large
Load Diff
@ -3390,6 +3390,8 @@ void Interface_UpdateMagicBar(PlayState* play) {
|
|||||||
gSaveContext.magicState = MAGIC_STATE_IDLE;
|
gSaveContext.magicState = MAGIC_STATE_IDLE;
|
||||||
if (CVarGetInteger(CVAR_COSMETIC("Consumable.MagicBorder.Changed"), 0)) {
|
if (CVarGetInteger(CVAR_COSMETIC("Consumable.MagicBorder.Changed"), 0)) {
|
||||||
sMagicBorder = CVarGetColor24(CVAR_COSMETIC("Consumable.MagicBorder.Value"), sMagicBorder_ori);
|
sMagicBorder = CVarGetColor24(CVAR_COSMETIC("Consumable.MagicBorder.Value"), sMagicBorder_ori);
|
||||||
|
} else {
|
||||||
|
sMagicBorder = sMagicBorder_ori;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user