nickpons666/Shiip-of-Hakinian-Espanol
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Standardizes naming conventions for ShipInit and MenuInit registrations. (#5837)

Browse Source 
Fixes missing `static` keywords for two `ShipInit` registrations.
This commit is contained in:
Malkierian
2025-10-10 13:26:06 -07:00
committed by GitHub
parent f253d24cdc
commit 8302c2322f
33 changed files with 44 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
soh/soh/Enhancements/BonkDamage.cpp
View File

@@ -48,4 +48,4 @@ void RegisterBonkDamage() {
});
}
static RegisterShipInitFunc registerBonkDamage(RegisterBonkDamage, { CVAR_ENHANCEMENT("BonkDamageMult") });
static RegisterShipInitFunc initFunc(RegisterBonkDamage, { CVAR_ENHANCEMENT("BonkDamageMult") });

5
soh/soh/Enhancements/BootToDebugWarpScreen.cpp
View File

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

2
soh/soh/Enhancements/Cheats/NoKeeseGuayTarget.cpp
View File

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

2
soh/soh/Enhancements/Cheats/NoRedeadFreeze.cpp
View File

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

2
soh/soh/Enhancements/ExtraModes/RupeeDash.cpp
View File

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

2
soh/soh/Enhancements/ExtraModes/ShadowTag.cpp
View File

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

2
soh/soh/Enhancements/Graphics/Disable2DBackgrounds.cpp
View File

@@ -158,4 +158,4 @@ void Register3DPreRenderedScenes() {
});
}
static RegisterShipInitFunc PreRender3DInitFunc(Register3DPreRenderedScenes, { CVAR_NAME });
static RegisterShipInitFunc initFunc(Register3DPreRenderedScenes, { CVAR_NAME });

2
soh/soh/Enhancements/Presets/Presets.cpp
View File

@@ -445,4 +445,4 @@ void RegisterPresetsWidgets() {
LoadPresets();
}
static RegisterMenuInitFunc initFunc(RegisterPresetsWidgets);
static RegisterMenuInitFunc menuInitFunc(RegisterPresetsWidgets);

2
soh/soh/Enhancements/QoL/DaytimeGS.cpp
View File

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

2
soh/soh/Enhancements/Restorations/GraveHoleJumps.cpp
View File

@@ -69,4 +69,4 @@ void RegisterGraveHoleJumps() {
ApplyGraveyardGeometryPatches();
}
static RegisterShipInitFunc initFunc_GraveHoleJumps(RegisterGraveHoleJumps, { CVAR_GRAVE_HOLE_NAME });
static RegisterShipInitFunc initFunc(RegisterGraveHoleJumps, { CVAR_GRAVE_HOLE_NAME });

3
soh/soh/Enhancements/Restorations/WideShutterDoorRanges.cpp
View File

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

2
soh/soh/Enhancements/TimeSavers/CrawlSpeed.cpp
View File

@@ -117,4 +117,4 @@ void CrawlSpeed_Register() {
});
}
static RegisterShipInitFunc initSpeed(CrawlSpeed_Register, { CVAR_CRAWL_SPEED_NAME });
static RegisterShipInitFunc initFunc(CrawlSpeed_Register, { CVAR_CRAWL_SPEED_NAME });

2
soh/soh/Enhancements/audio/AudioEditor.cpp
View File

@@ -894,4 +894,4 @@ void RegisterAudioWidgets() {
SohGui::mSohMenu->AddSearchWidget({ lowerOctaves, "Enhancements", "Audio Editor", "Audio Options" });
}
static RegisterMenuInitFunc initAudioWidgets(RegisterAudioWidgets);
static RegisterMenuInitFunc menuInitFunc(RegisterAudioWidgets);

2
soh/soh/Enhancements/audio/AudioHooks.cpp
View File

@@ -40,4 +40,4 @@ void RegisterAudioNotificationHooks() {
COND_HOOK(OnSeqPlayerInit, CVAR_SEQOVERLAY_VALUE, NotifySequenceName);
}
static RegisterShipInitFunc notifInitFunc(RegisterAudioNotificationHooks, { CVAR_SEQOVERLAY_NAME });
static RegisterShipInitFunc initFunc(RegisterAudioNotificationHooks, { CVAR_SEQOVERLAY_NAME });

10
soh/soh/Enhancements/controls/Mouse.cpp
View File

@@ -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"

2
soh/soh/Enhancements/controls/SohInputEditorWindow.cpp
View File

@@ -1969,4 +1969,4 @@ void RegisterInputEditorWidgets() {
SohGui::mSohMenu->AddSearchWidget({ dpadText, "Settings", "Controls", "Dpad Controls" });
}
static RegisterMenuInitFunc initInputWidgets(RegisterInputEditorWidgets);
static RegisterMenuInitFunc menuInitFunc(RegisterInputEditorWidgets);

6
soh/soh/Enhancements/cosmetics/CustomLogoTitle.cpp
View File

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

2
soh/soh/Enhancements/cosmetics/TimeFlowFileSelect.cpp
View File

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

2
soh/soh/Enhancements/debugger/actorViewer.cpp
View File

@@ -1228,4 +1228,4 @@ void ActorViewer_RegisterNameTagHooks() {
[](void* actor) { ActorViewer_AddTagForActor(static_cast<Actor*>(actor)); });
}
RegisterShipInitFunc nametagInit(ActorViewer_RegisterNameTagHooks, { CVAR_ACTOR_NAME_TAGS_ENABLED_NAME });
static RegisterShipInitFunc initFunc(ActorViewer_RegisterNameTagHooks, { CVAR_ACTOR_NAME_TAGS_ENABLED_NAME });

2
soh/soh/Enhancements/debugger/valueViewer.cpp
View File

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

4
soh/soh/Enhancements/randomizer/ShuffleBeehives.cpp
View File

@@ -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<BeehiveIdentity> RegisterBeehiveIdentity;
static RegisterShipInitFunc registerFunc(Rando::StaticData::RegisterBeehiveLocations);
static RegisterShipInitFunc registerBeehiveLocations(Rando::StaticData::RegisterBeehiveLocations);

4
soh/soh/Enhancements/randomizer/ShuffleCows.cpp
View File

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

4
soh/soh/Enhancements/randomizer/ShuffleCrates.cpp
View File

@@ -597,5 +597,5 @@ void Rando::StaticData::RegisterCrateLocations() {
static ObjectExtension::Register<CrateIdentity> RegisterCrateIdentity;
static ObjectExtension::Register<SmallCrateIdentity> 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);

2
soh/soh/Enhancements/randomizer/ShuffleFairies.cpp
View File

@@ -421,4 +421,4 @@ void Rando::StaticData::RegisterFairyLocations() {
static ObjectExtension::Register<FairyIdentity> RegisterFairyIdentity;
static RegisterShipInitFunc registerShuffleFairies(RegisterShuffleFairies, { "IS_RANDO" });
static RegisterShipInitFunc registerShuffleFairiesLocations(Rando::StaticData::RegisterFairyLocations);
static RegisterShipInitFunc registerFairyLocations(Rando::StaticData::RegisterFairyLocations);

2
soh/soh/Enhancements/randomizer/ShuffleFreestanding.cpp
View File

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

2
soh/soh/Enhancements/randomizer/ShuffleGrass.cpp
View File

@@ -530,4 +530,4 @@ void Rando::StaticData::RegisterGrassLocations() {
static ObjectExtension::Register<GrassIdentity> RegisterGrassIdentity;
static RegisterShipInitFunc registerShuffleGrass(RegisterShuffleGrass, { "IS_RANDO" });
static RegisterShipInitFunc registerShuffleGrassLocations(Rando::StaticData::RegisterGrassLocations);
static RegisterShipInitFunc registerGrassLocations(Rando::StaticData::RegisterGrassLocations);

2
soh/soh/Enhancements/randomizer/ShufflePots.cpp
View File

@@ -661,4 +661,4 @@ void Rando::StaticData::RegisterPotLocations() {
static ObjectExtension::Register<PotIdentity> RegisterPotIdentity;
static RegisterShipInitFunc registerShufflePots(RegisterShufflePots, { "IS_RANDO" });
static RegisterShipInitFunc registerShufflePotLocations(Rando::StaticData::RegisterPotLocations);
static RegisterShipInitFunc registerPotLocations(Rando::StaticData::RegisterPotLocations);

2
soh/soh/Enhancements/randomizer/ShuffleTrees.cpp
View File

@@ -262,4 +262,4 @@ void Rando::StaticData::RegisterTreeLocations() {
static ObjectExtension::Register<TreeIdentity> RegisterPotIdentity;
static RegisterShipInitFunc registerShuffleTrees(RegisterShuffleTrees, { "IS_RANDO" });
static RegisterShipInitFunc registerShuffleTreeLocations(Rando::StaticData::RegisterTreeLocations);
static RegisterShipInitFunc registerTreeLocations(Rando::StaticData::RegisterTreeLocations);

2
soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
View File

@@ -2298,5 +2298,5 @@ void RegisterCheckTrackerWidgets() {
});
}
static RegisterMenuInitFunc initCheckTrackerWidgets(RegisterCheckTrackerWidgets);
static RegisterMenuInitFunc menuInitFunc(RegisterCheckTrackerWidgets);
} // namespace CheckTracker

2
soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp
View File

@@ -2125,4 +2125,4 @@ void RegisterItemTrackerWidgets() {
{ hookshotIdentWidget, "Settings", "Controls", "Camera Controls", "longshot icon" });
}
static RegisterMenuInitFunc initItemTrackerWidgets(RegisterItemTrackerWidgets);
static RegisterMenuInitFunc menuInitFunc(RegisterItemTrackerWidgets);

4
soh/soh/Enhancements/timesaver_hook_handlers.cpp
View File

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

2
soh/soh/ObjectExtension/ActorMaximumHealth.cpp
View File

@@ -26,4 +26,4 @@ static void ActorMaximumHealth_Register() {
});
}
static RegisterShipInitFunc actorMaximumHealthInit(ActorMaximumHealth_Register);
static RegisterShipInitFunc initFunc(ActorMaximumHealth_Register);

2
soh/soh/SohGui/ResolutionEditor.cpp
View File

@@ -597,6 +597,6 @@ bool IsDroppingFrames() {
}
static RegisterMenuUpdateFunc updateFunc(UpdateResolutionVars, "Settings", "Graphics");
static RegisterMenuInitFunc initFunc(RegisterResolutionWidgets);
static RegisterMenuInitFunc menuInitFunc(RegisterResolutionWidgets);
} // namespace SohGui