mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-12-12 11:12:20 -05:00
Code Issues Projects Releases Wiki Activity

Cosmetics cleanup (#4587)

Browse Source 
* 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:
Malkierian 2024-11-29 11:38:40 -07:00 committed by GitHub
parent a92c08dea1
commit f7378a9f76
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 377 additions and 407 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

782
soh/soh/Enhancements/cosmetics/CosmeticsEditor.cpp
View File

File diff suppressed because it is too large Load Diff

2
soh/src/code/z_parameter.c
View File

@ -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;
} }