Skip to content

Commit 303fe7d

Browse files
Malkieriangarrettjoecox
Malkierian
and
garrettjoecox
authored
Swap all cosmetics CVars to macros. (HarbourMasters#4065)
Lots of renames. Co-authored-by: Garrett Cox <[email protected]>
1 parent 56d8dd6 commit 303fe7d

File tree

45 files changed

+1290
-1289
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+1290
-1289
lines changed

‎soh/soh/Enhancements/cosmetics/CosmeticsEditor.cpp

+391-391
Large diffs are not rendered by default.

‎soh/soh/Enhancements/game-interactor/GameInteractor_RawAction.cpp

+36-36
Original file line numberDiff line numberDiff line change
@@ -428,34 +428,34 @@ void GameInteractor::RawAction::SetCosmeticsColor(uint8_t cosmeticCategory, uint
428428

429429
switch (cosmeticCategory) {
430430
case GI_COSMETICS_TUNICS:
431-
CVarSetColor("gCosmetics.Link_KokiriTunic.Value", newColor);
432-
CVarSetInteger("gCosmetics.Link_KokiriTunic.Changed", 1);
433-
CVarSetColor("gCosmetics.Link_GoronTunic.Value", newColor);
434-
CVarSetInteger("gCosmetics.Link_GoronTunic.Changed", 1);
435-
CVarSetColor("gCosmetics.Link_ZoraTunic.Value", newColor);
436-
CVarSetInteger("gCosmetics.Link_ZoraTunic.Changed", 1);
431+
CVarSetColor(CVAR_COSMETIC("Link.KokiriTunic.Value"), newColor);
432+
CVarSetInteger(CVAR_COSMETIC("Link.KokiriTunic.Changed"), 1);
433+
CVarSetColor(CVAR_COSMETIC("Link.GoronTunic.Value"), newColor);
434+
CVarSetInteger(CVAR_COSMETIC("Link.GoronTunic.Changed"), 1);
435+
CVarSetColor(CVAR_COSMETIC("Link.ZoraTunic.Value"), newColor);
436+
CVarSetInteger(CVAR_COSMETIC("Link.ZoraTunic.Changed"), 1);
437437
break;
438438
case GI_COSMETICS_NAVI:
439-
CVarSetColor("gCosmetics.Navi_EnemyPrimary.Value", newColor);
440-
CVarSetInteger("gCosmetics.Navi_EnemyPrimary.Changed", 1);
441-
CVarSetColor("gCosmetics.Navi_EnemySecondary.Value", newColor);
442-
CVarSetInteger("gCosmetics.Navi_EnemySecondary.Changed", 1);
443-
CVarSetColor("gCosmetics.Navi_IdlePrimary.Value", newColor);
444-
CVarSetInteger("gCosmetics.Navi_IdlePrimary.Changed", 1);
445-
CVarSetColor("gCosmetics.Navi_IdleSecondary.Value", newColor);
446-
CVarSetInteger("gCosmetics.Navi_IdleSecondary.Changed", 1);
447-
CVarSetColor("gCosmetics.Navi_NPCPrimary.Value", newColor);
448-
CVarSetInteger("gCosmetics.Navi_NPCPrimary.Changed", 1);
449-
CVarSetColor("gCosmetics.Navi_NPCSecondary.Value", newColor);
450-
CVarSetInteger("gCosmetics.Navi_NPCSecondary.Changed", 1);
451-
CVarSetColor("gCosmetics.Navi_PropsPrimary.Value", newColor);
452-
CVarSetInteger("gCosmetics.Navi_PropsPrimary.Changed", 1);
453-
CVarSetColor("gCosmetics.Navi_PropsSecondary.Value", newColor);
454-
CVarSetInteger("gCosmetics.Navi_PropsSecondary.Changed", 1);
439+
CVarSetColor(CVAR_COSMETIC("Navi.EnemyPrimary.Value"), newColor);
440+
CVarSetInteger(CVAR_COSMETIC("Navi.EnemyPrimary.Changed"), 1);
441+
CVarSetColor(CVAR_COSMETIC("Navi.EnemySecondary.Value"), newColor);
442+
CVarSetInteger(CVAR_COSMETIC("Navi.EnemySecondary.Changed"), 1);
443+
CVarSetColor(CVAR_COSMETIC("Navi.IdlePrimary.Value"), newColor);
444+
CVarSetInteger(CVAR_COSMETIC("Navi.IdlePrimary.Changed"), 1);
445+
CVarSetColor(CVAR_COSMETIC("Navi.IdleSecondary.Value"), newColor);
446+
CVarSetInteger(CVAR_COSMETIC("Navi.IdleSecondary.Changed"), 1);
447+
CVarSetColor(CVAR_COSMETIC("Navi.NPCPrimary.Value"), newColor);
448+
CVarSetInteger(CVAR_COSMETIC("Navi.NPCPrimary.Changed"), 1);
449+
CVarSetColor(CVAR_COSMETIC("Navi.NPCSecondary.Value"), newColor);
450+
CVarSetInteger(CVAR_COSMETIC("Navi.NPCSecondary.Changed"), 1);
451+
CVarSetColor(CVAR_COSMETIC("Navi.PropsPrimary.Value"), newColor);
452+
CVarSetInteger(CVAR_COSMETIC("Navi.PropsPrimary.Changed"), 1);
453+
CVarSetColor(CVAR_COSMETIC("Navi.PropsSecondary.Value"), newColor);
454+
CVarSetInteger(CVAR_COSMETIC("Navi.PropsSecondary.Changed"), 1);
455455
break;
456456
case GI_COSMETICS_HAIR:
457-
CVarSetColor("gCosmetics.Link_Hair.Value", newColor);
458-
CVarSetInteger("gCosmetics.Link_Hair.Changed", 1);
457+
CVarSetColor(CVAR_COSMETIC("Link.Hair.Value"), newColor);
458+
CVarSetInteger(CVAR_COSMETIC("Link.Hair.Changed"), 1);
459459
break;
460460
}
461461

@@ -465,18 +465,18 @@ void GameInteractor::RawAction::SetCosmeticsColor(uint8_t cosmeticCategory, uint
465465

466466
void GameInteractor::RawAction::RandomizeCosmeticsColors(bool excludeBiddingWarColors) {
467467
const char* cvarsToLock[12] = {
468-
"gCosmetics.Link_KokiriTunic.Locked",
469-
"gCosmetics.Link_GoronTunic.Locked",
470-
"gCosmetics.Link_ZoraTunic.Locked",
471-
"gCosmetics.Navi_EnemyPrimary.Locked",
472-
"gCosmetics.Navi_EnemySecondary.Locked",
473-
"gCosmetics.Navi_IdlePrimary.Locked",
474-
"gCosmetics.Navi_IdleSecondary.Locked",
475-
"gCosmetics.Navi_NPCPrimary.Locked",
476-
"gCosmetics.Navi_NPCSecondary.Locked",
477-
"gCosmetics.Navi_PropsPrimary.Locked",
478-
"gCosmetics.Navi_PropsSecondary.Locked",
479-
"gCosmetics.Link_Hair.Locked"
468+
CVAR_COSMETIC("Link.KokiriTunic.Locked"),
469+
CVAR_COSMETIC("Link.GoronTunic.Locked"),
470+
CVAR_COSMETIC("Link.ZoraTunic.Locked"),
471+
CVAR_COSMETIC("Navi.EnemyPrimary.Locked"),
472+
CVAR_COSMETIC("Navi.EnemySecondary.Locked"),
473+
CVAR_COSMETIC("Navi.IdlePrimary.Locked"),
474+
CVAR_COSMETIC("Navi.IdleSecondary.Locked"),
475+
CVAR_COSMETIC("Navi.NPCPrimary.Locked"),
476+
CVAR_COSMETIC("Navi.NPCSecondary.Locked"),
477+
CVAR_COSMETIC("Navi.PropsPrimary.Locked"),
478+
CVAR_COSMETIC("Navi.PropsSecondary.Locked"),
479+
CVAR_COSMETIC("Link.Hair.Locked")
480480
};
481481

482482
if (excludeBiddingWarColors) {

‎soh/soh/Enhancements/nametag.cpp

+5-4
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#include "soh/frame_interpolation.h"
66
#include "soh/Enhancements/custom-message/CustomMessageInterfaceAddon.h"
77
#include "soh/Enhancements/game-interactor/GameInteractor.h"
8+
#include "soh/OTRGlobals.h"
89

910
extern "C" {
1011
#include "z64.h"
@@ -70,11 +71,11 @@ void DrawNameTag(PlayState* play, const NameTag* nameTag) {
7071
Color_RGBA8 textboxColor = { 0, 0, 0, 80};
7172
Color_RGBA8 textColor = { 255, 255, 255, 255 };
7273

73-
if (CVarGetInteger("gCosmetics.Hud_NameTagActorBackground.Changed", 0)) {
74-
textboxColor = CVarGetColor("gCosmetics.Hud_NameTagActorBackground.Value", textboxColor);
74+
if (CVarGetInteger(CVAR_COSMETIC("HUD.NameTagActorBackground.Changed"), 0)) {
75+
textboxColor = CVarGetColor(CVAR_COSMETIC("HUD.NameTagActorBackground.Value"), textboxColor);
7576
}
76-
if (CVarGetInteger("gCosmetics.Hud_NameTagActorText.Changed", 0)) {
77-
textColor = CVarGetColor("gCosmetics.Hud_NameTagActorText.Value", textColor);
77+
if (CVarGetInteger(CVAR_COSMETIC("HUD.NameTagActorText.Changed"), 0)) {
78+
textColor = CVarGetColor(CVAR_COSMETIC("HUD.NameTagActorText.Value"), textColor);
7879
}
7980

8081
FrameInterpolation_RecordOpenChild(nameTag->actor, 10);

‎soh/soh/Enhancements/presets.h

+7-7
Original file line numberDiff line numberDiff line change
@@ -345,12 +345,12 @@ const std::vector<const char*> cheatCvars = {
345345
CVAR_CHEAT("DekuStick"),
346346
CVAR_DEVELOPER_TOOLS("DebugWarpScreenTranslation"),
347347
CVAR_DEVELOPER_TOOLS("DebugSaveFileMode"),
348-
"gCosmetics.Link_BodyScale.Changed",
349-
"gCosmetics.Link_BodyScale.Value",
350-
"gCosmetics.Link_HeadScale.Changed",
351-
"gCosmetics.Link_HeadScale.Value",
352-
"gCosmetics.Link_SwordScale.Changed",
353-
"gCosmetics.Link_SwordScale.Value",
348+
CVAR_COSMETIC("Link.BodyScale.Changed"),
349+
CVAR_COSMETIC("Link.BodyScale.Value"),
350+
CVAR_COSMETIC("Link.HeadScale.Changed"),
351+
CVAR_COSMETIC("Link.HeadScale.Value"),
352+
CVAR_COSMETIC("Link.SwordScale.Changed"),
353+
CVAR_COSMETIC("Link.SwordScale.Value"),
354354
CVAR_ENHANCEMENT("RememberMapToggleState"),
355355
};
356356

@@ -950,7 +950,7 @@ const std::vector<PresetEntry> spockRaceNoLogicPresetEntries = {
950950
PRESET_ENTRY_S32(CVAR_CHEAT("EasyPauseBuffer"), 1),
951951
PRESET_ENTRY_S32(CVAR_ENHANCEMENT("MinimumFishWeightChild"), 3),
952952
PRESET_ENTRY_S32(CVAR_ENHANCEMENT("ClimbSpeed"), 4),
953-
PRESET_ENTRY_S32("gCosmetics.Goron_NeckLength", 1000),
953+
PRESET_ENTRY_S32(CVAR_COSMETIC("Goron.NeckLength"), 1000),
954954
PRESET_ENTRY_S32(CVAR_ENHANCEMENT("CreditsFix"), 1),
955955
PRESET_ENTRY_S32(CVAR_ENHANCEMENT("CustomizeFishing"), 1),
956956
PRESET_ENTRY_S32(CVAR_ENHANCEMENT("DampeAllNight"), 1),

‎soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1516,7 +1516,7 @@ static std::set<std::string> rainbowCVars = {
15161516

15171517
int hue = 0;
15181518
void RainbowTick() {
1519-
float freqHue = hue * 2 * M_PI / (360 * CVarGetFloat("gCosmetics.RainbowSpeed", 0.6f));
1519+
float freqHue = hue * 2 * M_PI / (360 * CVarGetFloat(CVAR_COSMETIC("RainbowSpeed"), 0.6f));
15201520
for (auto& cvar : rainbowCVars) {
15211521
if (CVarGetInteger((cvar + "RBM").c_str(), 0) == 0) {
15221522
continue;

‎soh/soh/OTRGlobals.cpp

+13-13
Original file line numberDiff line numberDiff line change
@@ -2123,17 +2123,17 @@ Color_RGB8 GetColorForControllerLED() {
21232123
switch (CUR_EQUIP_VALUE(EQUIP_TYPE_TUNIC)) {
21242124
case EQUIP_VALUE_TUNIC_KOKIRI:
21252125
color = source == LED_SOURCE_TUNIC_COSMETICS
2126-
? CVarGetColor24("gCosmetics.Link_KokiriTunic.Value", kokiriColor)
2126+
? CVarGetColor24(CVAR_COSMETIC("Link.KokiriTunic.Value"), kokiriColor)
21272127
: kokiriColor;
21282128
break;
21292129
case EQUIP_VALUE_TUNIC_GORON:
21302130
color = source == LED_SOURCE_TUNIC_COSMETICS
2131-
? CVarGetColor24("gCosmetics.Link_GoronTunic.Value", goronColor)
2131+
? CVarGetColor24(CVAR_COSMETIC("Link.GoronTunic.Value"), goronColor)
21322132
: goronColor;
21332133
break;
21342134
case EQUIP_VALUE_TUNIC_ZORA:
21352135
color = source == LED_SOURCE_TUNIC_COSMETICS
2136-
? CVarGetColor24("gCosmetics.Link_ZoraTunic.Value", zoraColor)
2136+
? CVarGetColor24(CVAR_COSMETIC("Link.ZoraTunic.Value"), zoraColor)
21372137
: zoraColor;
21382138
break;
21392139
}
@@ -2145,40 +2145,40 @@ Color_RGB8 GetColorForControllerLED() {
21452145
switch (category) {
21462146
case ACTORCAT_PLAYER:
21472147
if (source == LED_SOURCE_NAVI_COSMETICS &&
2148-
CVarGetInteger("gCosmetics.Navi_IdlePrimary.Changed", 0)) {
2149-
color = CVarGetColor24("gCosmetics.Navi_IdlePrimary.Value", defaultIdleColor.inner);
2148+
CVarGetInteger(CVAR_COSMETIC("Navi.IdlePrimary.Changed"), 0)) {
2149+
color = CVarGetColor24(CVAR_COSMETIC("Navi.IdlePrimary.Value"), defaultIdleColor.inner);
21502150
break;
21512151
}
21522152
color = LEDColorDefaultNaviColorList[category].inner;
21532153
break;
21542154
case ACTORCAT_NPC:
21552155
if (source == LED_SOURCE_NAVI_COSMETICS &&
2156-
CVarGetInteger("gCosmetics.Navi_NPCPrimary.Changed", 0)) {
2157-
color = CVarGetColor24("gCosmetics.Navi_NPCPrimary.Value", defaultNPCColor.inner);
2156+
CVarGetInteger(CVAR_COSMETIC("Navi.NPCPrimary.Changed"), 0)) {
2157+
color = CVarGetColor24(CVAR_COSMETIC("Navi.NPCPrimary.Value"), defaultNPCColor.inner);
21582158
break;
21592159
}
21602160
color = LEDColorDefaultNaviColorList[category].inner;
21612161
break;
21622162
case ACTORCAT_ENEMY:
21632163
case ACTORCAT_BOSS:
21642164
if (source == LED_SOURCE_NAVI_COSMETICS &&
2165-
CVarGetInteger("gCosmetics.Navi_EnemyPrimary.Changed", 0)) {
2166-
color = CVarGetColor24("gCosmetics.Navi_EnemyPrimary.Value", defaultEnemyColor.inner);
2165+
CVarGetInteger(CVAR_COSMETIC("Navi.EnemyPrimary.Changed"), 0)) {
2166+
color = CVarGetColor24(CVAR_COSMETIC("Navi.EnemyPrimary.Value"), defaultEnemyColor.inner);
21672167
break;
21682168
}
21692169
color = LEDColorDefaultNaviColorList[category].inner;
21702170
break;
21712171
default:
21722172
if (source == LED_SOURCE_NAVI_COSMETICS &&
2173-
CVarGetInteger("gCosmetics.Navi_PropsPrimary.Changed", 0)) {
2174-
color = CVarGetColor24("gCosmetics.Navi_PropsPrimary.Value", defaultPropsColor.inner);
2173+
CVarGetInteger(CVAR_COSMETIC("Navi.PropsPrimary.Changed"), 0)) {
2174+
color = CVarGetColor24(CVAR_COSMETIC("Navi.PropsPrimary.Value"), defaultPropsColor.inner);
21752175
break;
21762176
}
21772177
color = LEDColorDefaultNaviColorList[category].inner;
21782178
}
21792179
} else { // No target actor.
2180-
if (source == LED_SOURCE_NAVI_COSMETICS && CVarGetInteger("gCosmetics.Navi_IdlePrimary.Changed", 0)) {
2181-
color = CVarGetColor24("gCosmetics.Navi_IdlePrimary.Value", defaultIdleColor.inner);
2180+
if (source == LED_SOURCE_NAVI_COSMETICS && CVarGetInteger(CVAR_COSMETIC("Navi.IdlePrimary.Changed"), 0)) {
2181+
color = CVarGetColor24(CVAR_COSMETIC("Navi.IdlePrimary.Value"), defaultIdleColor.inner);
21822182
} else {
21832183
color = LEDColorDefaultNaviColorList[ACTORCAT_PLAYER].inner;
21842184
}

‎soh/src/code/z_actor.c

+22-22
Original file line numberDiff line numberDiff line change
@@ -353,50 +353,50 @@ void func_8002BE98(TargetContext* targetCtx, s32 actorCategory, PlayState* play)
353353
}
354354

355355
void func_8002BF60(TargetContext* targetCtx, Actor* actor, s32 actorCategory, PlayState* play) {
356-
if (CVarGetInteger("gCosmetics.Navi_IdlePrimary.Changed", 0)) {
357-
sNaviColorList[ACTORCAT_PLAYER].inner = CVarGetColor("gCosmetics.Navi_IdlePrimary.Value", defaultIdlePrimaryColor);
356+
if (CVarGetInteger(CVAR_COSMETIC("Navi.IdlePrimary.Changed"), 0)) {
357+
sNaviColorList[ACTORCAT_PLAYER].inner = CVarGetColor(CVAR_COSMETIC("Navi.IdlePrimary.Value"), defaultIdlePrimaryColor);
358358
} else {
359359
sNaviColorList[ACTORCAT_PLAYER].inner = defaultIdlePrimaryColor;
360360
}
361-
if (CVarGetInteger("gCosmetics.Navi_IdleSecondary.Changed", 0)) {
362-
sNaviColorList[ACTORCAT_PLAYER].outer = CVarGetColor("gCosmetics.Navi_IdleSecondary.Value", defaultIdleSecondaryColor);
361+
if (CVarGetInteger(CVAR_COSMETIC("Navi.IdleSecondary.Changed"), 0)) {
362+
sNaviColorList[ACTORCAT_PLAYER].outer = CVarGetColor(CVAR_COSMETIC("Navi.IdleSecondary.Value"), defaultIdleSecondaryColor);
363363
} else {
364364
sNaviColorList[ACTORCAT_PLAYER].outer = defaultIdleSecondaryColor;
365365
}
366366

367-
if (CVarGetInteger("gCosmetics.Navi_NPCPrimary.Changed", 0)) {
368-
sNaviColorList[ACTORCAT_NPC].inner = CVarGetColor("gCosmetics.Navi_NPCPrimary.Value", defaultNPCPrimaryColor);
367+
if (CVarGetInteger(CVAR_COSMETIC("Navi.NPCPrimary.Changed"), 0)) {
368+
sNaviColorList[ACTORCAT_NPC].inner = CVarGetColor(CVAR_COSMETIC("Navi.NPCPrimary.Value"), defaultNPCPrimaryColor);
369369
} else {
370370
sNaviColorList[ACTORCAT_NPC].inner = defaultNPCPrimaryColor;
371371
}
372-
if (CVarGetInteger("gCosmetics.Navi_NPCSecondary.Changed", 0)) {
373-
sNaviColorList[ACTORCAT_NPC].outer = CVarGetColor("gCosmetics.Navi_NPCSecondary.Value", defaultNPCSecondaryColor);
372+
if (CVarGetInteger(CVAR_COSMETIC("Navi.NPCSecondary.Changed"), 0)) {
373+
sNaviColorList[ACTORCAT_NPC].outer = CVarGetColor(CVAR_COSMETIC("Navi.NPCSecondary.Value"), defaultNPCSecondaryColor);
374374
} else {
375375
sNaviColorList[ACTORCAT_NPC].outer = defaultNPCSecondaryColor;
376376
}
377377

378-
if (CVarGetInteger("gCosmetics.Navi_EnemyPrimary.Changed", 0)) {
379-
sNaviColorList[ACTORCAT_ENEMY].inner = CVarGetColor("gCosmetics.Navi_EnemyPrimary.Value", defaultEnemyPrimaryColor);
380-
sNaviColorList[ACTORCAT_BOSS].inner = CVarGetColor("gCosmetics.Navi_EnemyPrimary.Value", defaultEnemyPrimaryColor);
378+
if (CVarGetInteger(CVAR_COSMETIC("Navi.EnemyPrimary.Changed"), 0)) {
379+
sNaviColorList[ACTORCAT_ENEMY].inner = CVarGetColor(CVAR_COSMETIC("Navi.EnemyPrimary.Value"), defaultEnemyPrimaryColor);
380+
sNaviColorList[ACTORCAT_BOSS].inner = CVarGetColor(CVAR_COSMETIC("Navi.EnemyPrimary.Value"), defaultEnemyPrimaryColor);
381381
} else {
382382
sNaviColorList[ACTORCAT_ENEMY].inner = defaultEnemyPrimaryColor;
383383
sNaviColorList[ACTORCAT_BOSS].inner = defaultEnemyPrimaryColor;
384384
}
385-
if (CVarGetInteger("gCosmetics.Navi_EnemySecondary.Changed", 0)) {
386-
sNaviColorList[ACTORCAT_ENEMY].outer = CVarGetColor("gCosmetics.Navi_EnemySecondary.Value", defaultEnemySecondaryColor);
387-
sNaviColorList[ACTORCAT_BOSS].outer = CVarGetColor("gCosmetics.Navi_EnemySecondary.Value", defaultEnemySecondaryColor);
385+
if (CVarGetInteger(CVAR_COSMETIC("Navi.EnemySecondary.Changed"), 0)) {
386+
sNaviColorList[ACTORCAT_ENEMY].outer = CVarGetColor(CVAR_COSMETIC("Navi.EnemySecondary.Value"), defaultEnemySecondaryColor);
387+
sNaviColorList[ACTORCAT_BOSS].outer = CVarGetColor(CVAR_COSMETIC("Navi.EnemySecondary.Value"), defaultEnemySecondaryColor);
388388
} else {
389389
sNaviColorList[ACTORCAT_ENEMY].outer = defaultEnemySecondaryColor;
390390
sNaviColorList[ACTORCAT_BOSS].outer = defaultEnemySecondaryColor;
391391
}
392392

393-
if (CVarGetInteger("gCosmetics.Navi_PropsPrimary.Changed", 0)) {
394-
sNaviColorList[ACTORCAT_PROP].inner = CVarGetColor("gCosmetics.Navi_PropsPrimary.Value", defaultPropsPrimaryColor);
393+
if (CVarGetInteger(CVAR_COSMETIC("Navi.PropsPrimary.Changed"), 0)) {
394+
sNaviColorList[ACTORCAT_PROP].inner = CVarGetColor(CVAR_COSMETIC("Navi.PropsPrimary.Value"), defaultPropsPrimaryColor);
395395
} else {
396396
sNaviColorList[ACTORCAT_PROP].inner = defaultPropsPrimaryColor;
397397
}
398-
if (CVarGetInteger("gCosmetics.Navi_PropsSecondary.Changed", 0)) {
399-
sNaviColorList[ACTORCAT_PROP].outer = CVarGetColor("gCosmetics.Navi_PropsSecondary.Value", defaultPropsSecondaryColor);
398+
if (CVarGetInteger(CVAR_COSMETIC("Navi.PropsSecondary.Changed"), 0)) {
399+
sNaviColorList[ACTORCAT_PROP].outer = CVarGetColor(CVAR_COSMETIC("Navi.PropsSecondary.Value"), defaultPropsSecondaryColor);
400400
} else {
401401
sNaviColorList[ACTORCAT_PROP].outer = defaultPropsSecondaryColor;
402402
}
@@ -1119,10 +1119,10 @@ void TitleCard_Draw(PlayState* play, TitleCardContext* titleCtx) {
11191119
if (titleCtx->alpha != 0) {
11201120
width = titleCtx->width;
11211121
height = titleCtx->height;
1122-
s16 TitleCard_PosX_Modifier = (titleCtx->isBossCard ? CVarGetInteger("gTCBPosX", 0) : CVarGetInteger("gTCMPosX", 0));
1123-
s16 TitleCard_PosY_Modifier = (titleCtx->isBossCard ? CVarGetInteger("gTCBPosY", 0) : CVarGetInteger("gTCMPosY", 0));
1124-
s16 TitleCard_PosType_Checker = (titleCtx->isBossCard ? CVarGetInteger("gTCBPosType", 0) : CVarGetInteger("gTCMPosType", 0));
1125-
s16 TitleCard_Margin_Checker = (titleCtx->isBossCard ? CVarGetInteger("gTCBUseMargins", 0) : CVarGetInteger("gTCMUseMargins", 0));
1122+
s16 TitleCard_PosX_Modifier = (titleCtx->isBossCard ? CVarGetInteger(CVAR_COSMETIC("TitleCard.Boss.PosX"), 0) : CVarGetInteger(CVAR_COSMETIC("TitleCard.Map.PosX"), 0));
1123+
s16 TitleCard_PosY_Modifier = (titleCtx->isBossCard ? CVarGetInteger(CVAR_COSMETIC("TitleCard.Boss.PosY"), 0) : CVarGetInteger(CVAR_COSMETIC("TitleCard.Map.PosY"), 0));
1124+
s16 TitleCard_PosType_Checker = (titleCtx->isBossCard ? CVarGetInteger(CVAR_COSMETIC("TitleCard.Boss.PosType"), 0) : CVarGetInteger(CVAR_COSMETIC("TitleCard.Map.PosType"), 0));
1125+
s16 TitleCard_Margin_Checker = (titleCtx->isBossCard ? CVarGetInteger(CVAR_COSMETIC("TitleCard.Boss.UseMargins"), 0) : CVarGetInteger(CVAR_COSMETIC("TitleCard.Map.UseMargins"), 0));
11261126
s16 TitleCard_MarginX = 0;
11271127
s16 TitleCard_PosX = titleCtx->x;
11281128
s16 TitleCard_PosY = titleCtx->y;

0 commit comments

Comments
 (0)