From 8302c2322fe7cc1acb841be0dc10a2c9f6e4a09c Mon Sep 17 00:00:00 2001 From: Malkierian Date: Fri, 10 Oct 2025 13:26:06 -0700 Subject: [PATCH] Standardizes naming conventions for `ShipInit` and `MenuInit` registrations. (#5837) Fixes missing `static` keywords for two `ShipInit` registrations. --- soh/soh/Enhancements/BonkDamage.cpp | 2 +- soh/soh/Enhancements/BootToDebugWarpScreen.cpp | 5 ++--- soh/soh/Enhancements/Cheats/NoKeeseGuayTarget.cpp | 2 +- soh/soh/Enhancements/Cheats/NoRedeadFreeze.cpp | 2 +- soh/soh/Enhancements/ExtraModes/RupeeDash.cpp | 2 +- soh/soh/Enhancements/ExtraModes/ShadowTag.cpp | 2 +- soh/soh/Enhancements/Graphics/Disable2DBackgrounds.cpp | 2 +- soh/soh/Enhancements/Presets/Presets.cpp | 2 +- soh/soh/Enhancements/QoL/DaytimeGS.cpp | 2 +- soh/soh/Enhancements/Restorations/GraveHoleJumps.cpp | 2 +- .../Restorations/WideShutterDoorRanges.cpp | 3 +-- soh/soh/Enhancements/TimeSavers/CrawlSpeed.cpp | 2 +- soh/soh/Enhancements/audio/AudioEditor.cpp | 2 +- soh/soh/Enhancements/audio/AudioHooks.cpp | 2 +- soh/soh/Enhancements/controls/Mouse.cpp | 10 +++++----- soh/soh/Enhancements/controls/SohInputEditorWindow.cpp | 2 +- soh/soh/Enhancements/cosmetics/CustomLogoTitle.cpp | 6 +++--- soh/soh/Enhancements/cosmetics/TimeFlowFileSelect.cpp | 2 +- soh/soh/Enhancements/debugger/actorViewer.cpp | 2 +- soh/soh/Enhancements/debugger/valueViewer.cpp | 2 +- soh/soh/Enhancements/randomizer/ShuffleBeehives.cpp | 4 ++-- soh/soh/Enhancements/randomizer/ShuffleCows.cpp | 4 ++-- soh/soh/Enhancements/randomizer/ShuffleCrates.cpp | 4 ++-- soh/soh/Enhancements/randomizer/ShuffleFairies.cpp | 2 +- .../Enhancements/randomizer/ShuffleFreestanding.cpp | 2 +- soh/soh/Enhancements/randomizer/ShuffleGrass.cpp | 2 +- soh/soh/Enhancements/randomizer/ShufflePots.cpp | 2 +- soh/soh/Enhancements/randomizer/ShuffleTrees.cpp | 2 +- .../randomizer/randomizer_check_tracker.cpp | 2 +- .../randomizer/randomizer_item_tracker.cpp | 2 +- soh/soh/Enhancements/timesaver_hook_handlers.cpp | 4 ++-- soh/soh/ObjectExtension/ActorMaximumHealth.cpp | 2 +- soh/soh/SohGui/ResolutionEditor.cpp | 2 +- 33 files changed, 44 insertions(+), 46 deletions(-) diff --git a/soh/soh/Enhancements/BonkDamage.cpp b/soh/soh/Enhancements/BonkDamage.cpp index e11f46b78..c9e5e089a 100644 --- a/soh/soh/Enhancements/BonkDamage.cpp +++ b/soh/soh/Enhancements/BonkDamage.cpp @@ -48,4 +48,4 @@ void RegisterBonkDamage() { }); } -static RegisterShipInitFunc registerBonkDamage(RegisterBonkDamage, { CVAR_ENHANCEMENT("BonkDamageMult") }); +static RegisterShipInitFunc initFunc(RegisterBonkDamage, { CVAR_ENHANCEMENT("BonkDamageMult") }); diff --git a/soh/soh/Enhancements/BootToDebugWarpScreen.cpp b/soh/soh/Enhancements/BootToDebugWarpScreen.cpp index a2b8c6b60..dc0f1899b 100644 --- a/soh/soh/Enhancements/BootToDebugWarpScreen.cpp +++ b/soh/soh/Enhancements/BootToDebugWarpScreen.cpp @@ -42,6 +42,5 @@ void RegisterBootToDebugWarpScreen() { OnZTitleUpdateBootToDebugWarpScreen); } -static RegisterShipInitFunc initFunc_BootToDebugWarpScreen(RegisterBootToDebugWarpScreen, - { CVAR_DEBUG_ENABLED_NAME, - CVAR_BOOT_TO_DEBUG_WARP_SCREEN_NAME }); +static RegisterShipInitFunc initFunc(RegisterBootToDebugWarpScreen, + { CVAR_DEBUG_ENABLED_NAME, CVAR_BOOT_TO_DEBUG_WARP_SCREEN_NAME }); diff --git a/soh/soh/Enhancements/Cheats/NoKeeseGuayTarget.cpp b/soh/soh/Enhancements/Cheats/NoKeeseGuayTarget.cpp index 911f3cd25..3616191ca 100644 --- a/soh/soh/Enhancements/Cheats/NoKeeseGuayTarget.cpp +++ b/soh/soh/Enhancements/Cheats/NoKeeseGuayTarget.cpp @@ -20,4 +20,4 @@ void RegisterNoKeeseGuayTarget() { COND_VB_SHOULD(VB_GUAY_FORCE_FLY_AWAY, CVAR_NOKEESEGUAYTARGET_VALUE, { *should = true; }); } -static RegisterShipInitFunc initFunc_NoKeeseGuayTarget(RegisterNoKeeseGuayTarget, { CVAR_NOKEESEGUAYTARGET_NAME }); +static RegisterShipInitFunc initFunc(RegisterNoKeeseGuayTarget, { CVAR_NOKEESEGUAYTARGET_NAME }); diff --git a/soh/soh/Enhancements/Cheats/NoRedeadFreeze.cpp b/soh/soh/Enhancements/Cheats/NoRedeadFreeze.cpp index ccc406104..7ed245234 100644 --- a/soh/soh/Enhancements/Cheats/NoRedeadFreeze.cpp +++ b/soh/soh/Enhancements/Cheats/NoRedeadFreeze.cpp @@ -14,4 +14,4 @@ void RegisterNoRedeadFreeze() { COND_VB_SHOULD(VB_REDEAD_GIBDO_FREEZE_LINK, CVAR_NOREDEADFREEZE_VALUE, { *should = false; }); } -static RegisterShipInitFunc initFunc_NoRedeadFreeze(RegisterNoRedeadFreeze, { CVAR_NOREDEADFREEZE_NAME }); +static RegisterShipInitFunc initFunc(RegisterNoRedeadFreeze, { CVAR_NOREDEADFREEZE_NAME }); diff --git a/soh/soh/Enhancements/ExtraModes/RupeeDash.cpp b/soh/soh/Enhancements/ExtraModes/RupeeDash.cpp index 277868b20..20bdc16bc 100644 --- a/soh/soh/Enhancements/ExtraModes/RupeeDash.cpp +++ b/soh/soh/Enhancements/ExtraModes/RupeeDash.cpp @@ -40,4 +40,4 @@ void RegisterRupeeDash() { COND_HOOK(OnPlayerUpdate, CVAR_RUPEE_DASH_VALUE, UpdateRupeeDash); } -static RegisterShipInitFunc initFunc_RupeeDash(RegisterRupeeDash, { CVAR_RUPEE_DASH_NAME }); +static RegisterShipInitFunc initFunc(RegisterRupeeDash, { CVAR_RUPEE_DASH_NAME }); diff --git a/soh/soh/Enhancements/ExtraModes/ShadowTag.cpp b/soh/soh/Enhancements/ExtraModes/ShadowTag.cpp index dc85534c8..1b03b6c77 100644 --- a/soh/soh/Enhancements/ExtraModes/ShadowTag.cpp +++ b/soh/soh/Enhancements/ExtraModes/ShadowTag.cpp @@ -47,4 +47,4 @@ void RegisterShadowTag() { COND_HOOK(OnSceneInit, true, [](int16_t) { ResetShadowTagSpawnTimer(); }); } -static RegisterShipInitFunc initFunc_ShadowTag(RegisterShadowTag, { CVAR_SHADOW_TAG_NAME }); +static RegisterShipInitFunc initFunc(RegisterShadowTag, { CVAR_SHADOW_TAG_NAME }); diff --git a/soh/soh/Enhancements/Graphics/Disable2DBackgrounds.cpp b/soh/soh/Enhancements/Graphics/Disable2DBackgrounds.cpp index 9e9faafac..253e0abd2 100644 --- a/soh/soh/Enhancements/Graphics/Disable2DBackgrounds.cpp +++ b/soh/soh/Enhancements/Graphics/Disable2DBackgrounds.cpp @@ -158,4 +158,4 @@ void Register3DPreRenderedScenes() { }); } -static RegisterShipInitFunc PreRender3DInitFunc(Register3DPreRenderedScenes, { CVAR_NAME }); \ No newline at end of file +static RegisterShipInitFunc initFunc(Register3DPreRenderedScenes, { CVAR_NAME }); \ No newline at end of file diff --git a/soh/soh/Enhancements/Presets/Presets.cpp b/soh/soh/Enhancements/Presets/Presets.cpp index 75ff9aabd..058d5a2cd 100644 --- a/soh/soh/Enhancements/Presets/Presets.cpp +++ b/soh/soh/Enhancements/Presets/Presets.cpp @@ -445,4 +445,4 @@ void RegisterPresetsWidgets() { LoadPresets(); } -static RegisterMenuInitFunc initFunc(RegisterPresetsWidgets); +static RegisterMenuInitFunc menuInitFunc(RegisterPresetsWidgets); diff --git a/soh/soh/Enhancements/QoL/DaytimeGS.cpp b/soh/soh/Enhancements/QoL/DaytimeGS.cpp index fabf7457b..6d4474274 100644 --- a/soh/soh/Enhancements/QoL/DaytimeGS.cpp +++ b/soh/soh/Enhancements/QoL/DaytimeGS.cpp @@ -66,4 +66,4 @@ void RegisterDaytimeGoldSkultullas() { COND_HOOK(OnSceneSpawnActors, CVAR_DAYTIME_GS_VALUE, OnSpawnNighttimeGoldSkulltula); } -static RegisterShipInitFunc initFunc_DaytimeGoldSkulltulas(RegisterDaytimeGoldSkultullas, { CVAR_DAYTIME_GS_NAME }); +static RegisterShipInitFunc initFunc(RegisterDaytimeGoldSkultullas, { CVAR_DAYTIME_GS_NAME }); diff --git a/soh/soh/Enhancements/Restorations/GraveHoleJumps.cpp b/soh/soh/Enhancements/Restorations/GraveHoleJumps.cpp index 760c3c903..525d30dc2 100644 --- a/soh/soh/Enhancements/Restorations/GraveHoleJumps.cpp +++ b/soh/soh/Enhancements/Restorations/GraveHoleJumps.cpp @@ -69,4 +69,4 @@ void RegisterGraveHoleJumps() { ApplyGraveyardGeometryPatches(); } -static RegisterShipInitFunc initFunc_GraveHoleJumps(RegisterGraveHoleJumps, { CVAR_GRAVE_HOLE_NAME }); +static RegisterShipInitFunc initFunc(RegisterGraveHoleJumps, { CVAR_GRAVE_HOLE_NAME }); diff --git a/soh/soh/Enhancements/Restorations/WideShutterDoorRanges.cpp b/soh/soh/Enhancements/Restorations/WideShutterDoorRanges.cpp index 78339a48b..7c56fab24 100644 --- a/soh/soh/Enhancements/Restorations/WideShutterDoorRanges.cpp +++ b/soh/soh/Enhancements/Restorations/WideShutterDoorRanges.cpp @@ -27,5 +27,4 @@ void RegisterWideShutterDoorRange() { }); } -static RegisterShipInitFunc initFunc_WideShutterDoorRange(RegisterWideShutterDoorRange, - { CVAR_WIDE_SHUTTER_DOOR_RANGE }); +static RegisterShipInitFunc initFunc(RegisterWideShutterDoorRange, { CVAR_WIDE_SHUTTER_DOOR_RANGE }); diff --git a/soh/soh/Enhancements/TimeSavers/CrawlSpeed.cpp b/soh/soh/Enhancements/TimeSavers/CrawlSpeed.cpp index 7ada74e98..2b8794978 100644 --- a/soh/soh/Enhancements/TimeSavers/CrawlSpeed.cpp +++ b/soh/soh/Enhancements/TimeSavers/CrawlSpeed.cpp @@ -117,4 +117,4 @@ void CrawlSpeed_Register() { }); } -static RegisterShipInitFunc initSpeed(CrawlSpeed_Register, { CVAR_CRAWL_SPEED_NAME }); \ No newline at end of file +static RegisterShipInitFunc initFunc(CrawlSpeed_Register, { CVAR_CRAWL_SPEED_NAME }); \ No newline at end of file diff --git a/soh/soh/Enhancements/audio/AudioEditor.cpp b/soh/soh/Enhancements/audio/AudioEditor.cpp index 5a7fb1414..be6acae73 100644 --- a/soh/soh/Enhancements/audio/AudioEditor.cpp +++ b/soh/soh/Enhancements/audio/AudioEditor.cpp @@ -894,4 +894,4 @@ void RegisterAudioWidgets() { SohGui::mSohMenu->AddSearchWidget({ lowerOctaves, "Enhancements", "Audio Editor", "Audio Options" }); } -static RegisterMenuInitFunc initAudioWidgets(RegisterAudioWidgets); +static RegisterMenuInitFunc menuInitFunc(RegisterAudioWidgets); diff --git a/soh/soh/Enhancements/audio/AudioHooks.cpp b/soh/soh/Enhancements/audio/AudioHooks.cpp index d2d6aa279..f035eb0d1 100644 --- a/soh/soh/Enhancements/audio/AudioHooks.cpp +++ b/soh/soh/Enhancements/audio/AudioHooks.cpp @@ -40,4 +40,4 @@ void RegisterAudioNotificationHooks() { COND_HOOK(OnSeqPlayerInit, CVAR_SEQOVERLAY_VALUE, NotifySequenceName); } -static RegisterShipInitFunc notifInitFunc(RegisterAudioNotificationHooks, { CVAR_SEQOVERLAY_NAME }); \ No newline at end of file +static RegisterShipInitFunc initFunc(RegisterAudioNotificationHooks, { CVAR_SEQOVERLAY_NAME }); \ No newline at end of file diff --git a/soh/soh/Enhancements/controls/Mouse.cpp b/soh/soh/Enhancements/controls/Mouse.cpp index 87af5168b..26e122504 100644 --- a/soh/soh/Enhancements/controls/Mouse.cpp +++ b/soh/soh/Enhancements/controls/Mouse.cpp @@ -148,9 +148,9 @@ void Mouse_RegisterHandleQuickspin() { REGISTER_VB_SHOULD(VB_SHOULD_QUICKSPIN, { Mouse_HandleQuickspin(should, va_arg(args, s8*), va_arg(args, s8*)); }); } -static RegisterShipInitFunc initFunc_shieldRecenter(Mouse_RegisterRecenterCursorOnShield, { CVAR_ENABLE_MOUSE_NAME }); -static RegisterShipInitFunc initFunc_firstPerson(Mouse_RegisterHandleFirstPerson, { CVAR_ENABLE_MOUSE_NAME }); -static RegisterShipInitFunc initFunc_quickspinCount(Mouse_RegisterUpdateQuickspinCount, { CVAR_ENABLE_MOUSE_NAME }); -static RegisterShipInitFunc initFunc_quickspin(Mouse_RegisterHandleQuickspin, { CVAR_ENABLE_MOUSE_NAME }); -static RegisterShipInitFunc initFunc_shieldMove(Mouse_RegisterHandleShield, { CVAR_ENABLE_MOUSE_NAME }); +static RegisterShipInitFunc registerShieldRecenter(Mouse_RegisterRecenterCursorOnShield, { CVAR_ENABLE_MOUSE_NAME }); +static RegisterShipInitFunc registerFirstPerson(Mouse_RegisterHandleFirstPerson, { CVAR_ENABLE_MOUSE_NAME }); +static RegisterShipInitFunc registerQuickspinCount(Mouse_RegisterUpdateQuickspinCount, { CVAR_ENABLE_MOUSE_NAME }); +static RegisterShipInitFunc registerQuickspin(Mouse_RegisterHandleQuickspin, { CVAR_ENABLE_MOUSE_NAME }); +static RegisterShipInitFunc registerShieldMove(Mouse_RegisterHandleShield, { CVAR_ENABLE_MOUSE_NAME }); } // extern "C" diff --git a/soh/soh/Enhancements/controls/SohInputEditorWindow.cpp b/soh/soh/Enhancements/controls/SohInputEditorWindow.cpp index bdfe6c1c1..208833d61 100644 --- a/soh/soh/Enhancements/controls/SohInputEditorWindow.cpp +++ b/soh/soh/Enhancements/controls/SohInputEditorWindow.cpp @@ -1969,4 +1969,4 @@ void RegisterInputEditorWidgets() { SohGui::mSohMenu->AddSearchWidget({ dpadText, "Settings", "Controls", "Dpad Controls" }); } -static RegisterMenuInitFunc initInputWidgets(RegisterInputEditorWidgets); +static RegisterMenuInitFunc menuInitFunc(RegisterInputEditorWidgets); diff --git a/soh/soh/Enhancements/cosmetics/CustomLogoTitle.cpp b/soh/soh/Enhancements/cosmetics/CustomLogoTitle.cpp index 029284fa4..3ec872368 100644 --- a/soh/soh/Enhancements/cosmetics/CustomLogoTitle.cpp +++ b/soh/soh/Enhancements/cosmetics/CustomLogoTitle.cpp @@ -195,7 +195,7 @@ void RegisterCustomLogoTitle() { COND_HOOK(OnZTitleUpdate, true, OnZTitleUpdatePressButtonToSkip); } -static RegisterShipInitFunc initFuncAlways(RegisterCustomLogoTitle); +static RegisterShipInitFunc registerCustomLogo(RegisterCustomLogoTitle); // // // // // // // Bootsequence @@ -216,7 +216,7 @@ void RegisterCustomLogoTitleBootsequence() { COND_HOOK(OnZTitleUpdate, CVAR_BOOTSEQUENCE_VALUE == BOOTSEQUENCE_FILESELECT, OnZTitleUpdateSkipToFileSelect); } -static RegisterShipInitFunc initFuncBootsequence(RegisterCustomLogoTitleBootsequence, { CVAR_BOOTSEQUENCE_NAME }); +static RegisterShipInitFunc registerTitleBootSequence(RegisterCustomLogoTitleBootsequence, { CVAR_BOOTSEQUENCE_NAME }); // // // // // // // Let it Snow @@ -230,4 +230,4 @@ void RegisterCustomLogoTitleLetItSnow() { shouldDrawIceOnSpinningLogo = CVAR_LETITSNOW_VALUE != CVAR_LETITSNOW_DEFAULT; } -static RegisterShipInitFunc initFuncLetItSnow(RegisterCustomLogoTitleLetItSnow, { CVAR_LETITSNOW_NAME }); +static RegisterShipInitFunc registerLetItSnow(RegisterCustomLogoTitleLetItSnow, { CVAR_LETITSNOW_NAME }); diff --git a/soh/soh/Enhancements/cosmetics/TimeFlowFileSelect.cpp b/soh/soh/Enhancements/cosmetics/TimeFlowFileSelect.cpp index d33f4f7e8..bd99ca1b1 100644 --- a/soh/soh/Enhancements/cosmetics/TimeFlowFileSelect.cpp +++ b/soh/soh/Enhancements/cosmetics/TimeFlowFileSelect.cpp @@ -17,4 +17,4 @@ void RegisterTimeFlowFileSelect() { COND_HOOK(OnFileChooseMain, CVAR_TIMEFLOWFILESELECT_VALUE, OnFileChooseMainTimeFlowFileSelect); } -static RegisterShipInitFunc initFunc_TimeFlowFileSelect(RegisterTimeFlowFileSelect, { CVAR_TIMEFLOWFILESELECT_NAME }); +static RegisterShipInitFunc initFunc(RegisterTimeFlowFileSelect, { CVAR_TIMEFLOWFILESELECT_NAME }); diff --git a/soh/soh/Enhancements/debugger/actorViewer.cpp b/soh/soh/Enhancements/debugger/actorViewer.cpp index d21d9449e..5792a4ec0 100644 --- a/soh/soh/Enhancements/debugger/actorViewer.cpp +++ b/soh/soh/Enhancements/debugger/actorViewer.cpp @@ -1228,4 +1228,4 @@ void ActorViewer_RegisterNameTagHooks() { [](void* actor) { ActorViewer_AddTagForActor(static_cast(actor)); }); } -RegisterShipInitFunc nametagInit(ActorViewer_RegisterNameTagHooks, { CVAR_ACTOR_NAME_TAGS_ENABLED_NAME }); +static RegisterShipInitFunc initFunc(ActorViewer_RegisterNameTagHooks, { CVAR_ACTOR_NAME_TAGS_ENABLED_NAME }); diff --git a/soh/soh/Enhancements/debugger/valueViewer.cpp b/soh/soh/Enhancements/debugger/valueViewer.cpp index 4544979cb..a4ab75e72 100644 --- a/soh/soh/Enhancements/debugger/valueViewer.cpp +++ b/soh/soh/Enhancements/debugger/valueViewer.cpp @@ -151,7 +151,7 @@ void RegisterValueViewerHooks() { COND_HOOK(OnGameFrameUpdate, CVAR_VALUE, []() { ValueViewer_SetupDraw(); }); } -RegisterShipInitFunc initFunc(RegisterValueViewerHooks, { CVAR_NAME }); +static RegisterShipInitFunc initFunc(RegisterValueViewerHooks, { CVAR_NAME }); void ValueViewerWindow::DrawElement() { ImGui::BeginDisabled(CVarGetInteger(CVAR_SETTING("DisableChanges"), 0)); diff --git a/soh/soh/Enhancements/randomizer/ShuffleBeehives.cpp b/soh/soh/Enhancements/randomizer/ShuffleBeehives.cpp index c5a8b8534..00c060cf9 100644 --- a/soh/soh/Enhancements/randomizer/ShuffleBeehives.cpp +++ b/soh/soh/Enhancements/randomizer/ShuffleBeehives.cpp @@ -99,7 +99,7 @@ void RegisterShuffleBeehives() { COND_ID_HOOK(OnActorUpdate, ACTOR_OBJ_COMB, shouldRegister, ObjComb_RandomizerUpdate); } -static RegisterShipInitFunc initFunc(RegisterShuffleBeehives, { "IS_RANDO" }); +static RegisterShipInitFunc registerShuffleBeehives(RegisterShuffleBeehives, { "IS_RANDO" }); void Rando::StaticData::RegisterBeehiveLocations() { static bool registered = false; @@ -143,4 +143,4 @@ void Rando::StaticData::RegisterBeehiveLocations() { } static ObjectExtension::Register RegisterBeehiveIdentity; -static RegisterShipInitFunc registerFunc(Rando::StaticData::RegisterBeehiveLocations); +static RegisterShipInitFunc registerBeehiveLocations(Rando::StaticData::RegisterBeehiveLocations); diff --git a/soh/soh/Enhancements/randomizer/ShuffleCows.cpp b/soh/soh/Enhancements/randomizer/ShuffleCows.cpp index 17ae3a834..63fbd858c 100644 --- a/soh/soh/Enhancements/randomizer/ShuffleCows.cpp +++ b/soh/soh/Enhancements/randomizer/ShuffleCows.cpp @@ -58,7 +58,7 @@ void RegisterShuffleCows() { }); } -static RegisterShipInitFunc initFunc(RegisterShuffleCows, { "IS_RANDO" }); +static RegisterShipInitFunc registerShuffleCows(RegisterShuffleCows, { "IS_RANDO" }); void Rando::StaticData::RegisterCowLocations() { static bool registered = false; @@ -79,4 +79,4 @@ void Rando::StaticData::RegisterCowLocations() { // clang-format-on } -static RegisterShipInitFunc registerFunc(Rando::StaticData::RegisterCowLocations); +static RegisterShipInitFunc registerCowLocations(Rando::StaticData::RegisterCowLocations); diff --git a/soh/soh/Enhancements/randomizer/ShuffleCrates.cpp b/soh/soh/Enhancements/randomizer/ShuffleCrates.cpp index 6962b290d..007c12bc0 100644 --- a/soh/soh/Enhancements/randomizer/ShuffleCrates.cpp +++ b/soh/soh/Enhancements/randomizer/ShuffleCrates.cpp @@ -597,5 +597,5 @@ void Rando::StaticData::RegisterCrateLocations() { static ObjectExtension::Register RegisterCrateIdentity; static ObjectExtension::Register RegisterSmallCrateIdentity; -static RegisterShipInitFunc initFunc(RegisterShuffleCrates, { "IS_RANDO" }); -static RegisterShipInitFunc locFunc(Rando::StaticData::RegisterCrateLocations); +static RegisterShipInitFunc registerShuffleCrates(RegisterShuffleCrates, { "IS_RANDO" }); +static RegisterShipInitFunc registerCrateLocations(Rando::StaticData::RegisterCrateLocations); diff --git a/soh/soh/Enhancements/randomizer/ShuffleFairies.cpp b/soh/soh/Enhancements/randomizer/ShuffleFairies.cpp index 420ec0864..04e951e22 100644 --- a/soh/soh/Enhancements/randomizer/ShuffleFairies.cpp +++ b/soh/soh/Enhancements/randomizer/ShuffleFairies.cpp @@ -421,4 +421,4 @@ void Rando::StaticData::RegisterFairyLocations() { static ObjectExtension::Register RegisterFairyIdentity; static RegisterShipInitFunc registerShuffleFairies(RegisterShuffleFairies, { "IS_RANDO" }); -static RegisterShipInitFunc registerShuffleFairiesLocations(Rando::StaticData::RegisterFairyLocations); +static RegisterShipInitFunc registerFairyLocations(Rando::StaticData::RegisterFairyLocations); diff --git a/soh/soh/Enhancements/randomizer/ShuffleFreestanding.cpp b/soh/soh/Enhancements/randomizer/ShuffleFreestanding.cpp index 7291fdbef..dac291196 100644 --- a/soh/soh/Enhancements/randomizer/ShuffleFreestanding.cpp +++ b/soh/soh/Enhancements/randomizer/ShuffleFreestanding.cpp @@ -287,4 +287,4 @@ void Rando::StaticData::RegisterFreestandingLocations() { } static RegisterShipInitFunc registerShuffleFreestanding(RegisterShuffleFreestanding, { "IS_RANDO" }); -static RegisterShipInitFunc registerShuffleFreestandingLocations(Rando::StaticData::RegisterFreestandingLocations); +static RegisterShipInitFunc registerFreestandingLocations(Rando::StaticData::RegisterFreestandingLocations); diff --git a/soh/soh/Enhancements/randomizer/ShuffleGrass.cpp b/soh/soh/Enhancements/randomizer/ShuffleGrass.cpp index b11b06f3e..d82c3b393 100644 --- a/soh/soh/Enhancements/randomizer/ShuffleGrass.cpp +++ b/soh/soh/Enhancements/randomizer/ShuffleGrass.cpp @@ -530,4 +530,4 @@ void Rando::StaticData::RegisterGrassLocations() { static ObjectExtension::Register RegisterGrassIdentity; static RegisterShipInitFunc registerShuffleGrass(RegisterShuffleGrass, { "IS_RANDO" }); -static RegisterShipInitFunc registerShuffleGrassLocations(Rando::StaticData::RegisterGrassLocations); +static RegisterShipInitFunc registerGrassLocations(Rando::StaticData::RegisterGrassLocations); diff --git a/soh/soh/Enhancements/randomizer/ShufflePots.cpp b/soh/soh/Enhancements/randomizer/ShufflePots.cpp index 869af92e4..815562578 100644 --- a/soh/soh/Enhancements/randomizer/ShufflePots.cpp +++ b/soh/soh/Enhancements/randomizer/ShufflePots.cpp @@ -661,4 +661,4 @@ void Rando::StaticData::RegisterPotLocations() { static ObjectExtension::Register RegisterPotIdentity; static RegisterShipInitFunc registerShufflePots(RegisterShufflePots, { "IS_RANDO" }); -static RegisterShipInitFunc registerShufflePotLocations(Rando::StaticData::RegisterPotLocations); +static RegisterShipInitFunc registerPotLocations(Rando::StaticData::RegisterPotLocations); diff --git a/soh/soh/Enhancements/randomizer/ShuffleTrees.cpp b/soh/soh/Enhancements/randomizer/ShuffleTrees.cpp index 418468e30..14cb9c7b1 100644 --- a/soh/soh/Enhancements/randomizer/ShuffleTrees.cpp +++ b/soh/soh/Enhancements/randomizer/ShuffleTrees.cpp @@ -262,4 +262,4 @@ void Rando::StaticData::RegisterTreeLocations() { static ObjectExtension::Register RegisterPotIdentity; static RegisterShipInitFunc registerShuffleTrees(RegisterShuffleTrees, { "IS_RANDO" }); -static RegisterShipInitFunc registerShuffleTreeLocations(Rando::StaticData::RegisterTreeLocations); +static RegisterShipInitFunc registerTreeLocations(Rando::StaticData::RegisterTreeLocations); diff --git a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp index a907fdab4..e4d784664 100644 --- a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp +++ b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp @@ -2298,5 +2298,5 @@ void RegisterCheckTrackerWidgets() { }); } -static RegisterMenuInitFunc initCheckTrackerWidgets(RegisterCheckTrackerWidgets); +static RegisterMenuInitFunc menuInitFunc(RegisterCheckTrackerWidgets); } // namespace CheckTracker diff --git a/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp b/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp index b3acc96d5..0288539d1 100644 --- a/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp +++ b/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp @@ -2125,4 +2125,4 @@ void RegisterItemTrackerWidgets() { { hookshotIdentWidget, "Settings", "Controls", "Camera Controls", "longshot icon" }); } -static RegisterMenuInitFunc initItemTrackerWidgets(RegisterItemTrackerWidgets); +static RegisterMenuInitFunc menuInitFunc(RegisterItemTrackerWidgets); diff --git a/soh/soh/Enhancements/timesaver_hook_handlers.cpp b/soh/soh/Enhancements/timesaver_hook_handlers.cpp index 793583698..8bcd19903 100644 --- a/soh/soh/Enhancements/timesaver_hook_handlers.cpp +++ b/soh/soh/Enhancements/timesaver_hook_handlers.cpp @@ -1471,5 +1471,5 @@ void RegisterSkipTimerDelay() { }); } -static RegisterShipInitFunc skipTimerDelay(RegisterSkipTimerDelay, - { CVAR_ENHANCEMENT("TimeSavers.SkipMiscInteractions"), "IS_RANDO" }); +static RegisterShipInitFunc initFunc(RegisterSkipTimerDelay, + { CVAR_ENHANCEMENT("TimeSavers.SkipMiscInteractions"), "IS_RANDO" }); diff --git a/soh/soh/ObjectExtension/ActorMaximumHealth.cpp b/soh/soh/ObjectExtension/ActorMaximumHealth.cpp index d8c74404b..a712b02d5 100644 --- a/soh/soh/ObjectExtension/ActorMaximumHealth.cpp +++ b/soh/soh/ObjectExtension/ActorMaximumHealth.cpp @@ -26,4 +26,4 @@ static void ActorMaximumHealth_Register() { }); } -static RegisterShipInitFunc actorMaximumHealthInit(ActorMaximumHealth_Register); +static RegisterShipInitFunc initFunc(ActorMaximumHealth_Register); diff --git a/soh/soh/SohGui/ResolutionEditor.cpp b/soh/soh/SohGui/ResolutionEditor.cpp index 232458d9a..8e84e5ab7 100644 --- a/soh/soh/SohGui/ResolutionEditor.cpp +++ b/soh/soh/SohGui/ResolutionEditor.cpp @@ -597,6 +597,6 @@ bool IsDroppingFrames() { } static RegisterMenuUpdateFunc updateFunc(UpdateResolutionVars, "Settings", "Graphics"); -static RegisterMenuInitFunc initFunc(RegisterResolutionWidgets); +static RegisterMenuInitFunc menuInitFunc(RegisterResolutionWidgets); } // namespace SohGui