mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright synced 2026-08-13 12:38:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

Swap all cosmetics CVars to macros. (#4065)

Browse Source 
Lots of renames.

Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
This commit is contained in:
Malkierian
2024-04-25 19:41:55 -07:00
committed by GitHub
parent 56d8dd6d8b
commit 303fe7d906
45 changed files with 1271 additions and 1270 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soh/src/code/z_draw.c
+3 -3
View File
@@ -761,13 +761,13 @@ void GetItem_DrawRecoveryHeart(PlayState* play, s16 drawId) {
1 * -(play->state.frames * 2), 32, 32));
gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
G_MTX_MODELVIEW | G_MTX_LOAD);
if (CVarGetInteger("gCosmetics.Consumable_Hearts.Changed", 0)) {
Color_RGB8 color = CVarGetColor24("gCosmetics.Consumable_Hearts.Value", (Color_RGB8) { 255, 70, 50 });
if (CVarGetInteger(CVAR_COSMETIC("Consumable.Hearts.Changed"), 0)) {
Color_RGB8 color = CVarGetColor24(CVAR_COSMETIC("Consumable.Hearts.Value"), (Color_RGB8) { 255, 70, 50 });
gDPSetGrayscaleColor(POLY_XLU_DISP++, color.r, color.g, color.b, 255);
gSPGrayscale(POLY_XLU_DISP++, true);
}
gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[0]);
if (CVarGetInteger("gCosmetics.Consumable_Hearts.Changed", 0)) {
if (CVarGetInteger(CVAR_COSMETIC("Consumable.Hearts.Changed"), 0)) {
gSPGrayscale(POLY_XLU_DISP++, false);
}
CLOSE_DISPS(play->state.gfxCtx);