diff --git a/soh/soh/CrashHandlerExt.h b/soh/soh/CrashHandlerExt.h index ad1a6f1c66..7f0d97df64 100644 --- a/soh/soh/CrashHandlerExt.h +++ b/soh/soh/CrashHandlerExt.h @@ -1,3 +1,5 @@ +#pragma once + #include #ifdef __cplusplus diff --git a/soh/soh/Enhancements/FileSelectEnhancements.h b/soh/soh/Enhancements/FileSelectEnhancements.h index 4400841549..4aeea89cbf 100644 --- a/soh/soh/Enhancements/FileSelectEnhancements.h +++ b/soh/soh/Enhancements/FileSelectEnhancements.h @@ -1,5 +1,4 @@ -#ifndef FILE_SELECT_ENHANCEMENTS_H -#define FILE_SELECT_ENHANCEMENTS_H +#pragma once #include "z64.h" @@ -20,5 +19,3 @@ typedef enum { RSM_NO_RANDOMIZER_GENERATED, RSM_MAX, } RandomizerSettingsMenuEnums; - -#endif diff --git a/soh/soh/Enhancements/TimeDisplay/TimeDisplay.h b/soh/soh/Enhancements/TimeDisplay/TimeDisplay.h index 46a67c639a..5e37561610 100644 --- a/soh/soh/Enhancements/TimeDisplay/TimeDisplay.h +++ b/soh/soh/Enhancements/TimeDisplay/TimeDisplay.h @@ -1,3 +1,5 @@ +#pragma once + #include #include diff --git a/soh/soh/Enhancements/bootcommands.h b/soh/soh/Enhancements/bootcommands.h index 48b361b13e..a080538a8f 100644 --- a/soh/soh/Enhancements/bootcommands.h +++ b/soh/soh/Enhancements/bootcommands.h @@ -1,6 +1,3 @@ -#ifndef _BOOTCOMMANDS_H_ -#define _BOOTCOMMANDS_H_ +#pragma once void BootCommands_Init(); - -#endif \ No newline at end of file diff --git a/soh/soh/Enhancements/controls/Mouse.h b/soh/soh/Enhancements/controls/Mouse.h index c25360185a..c22d9ac5c0 100644 --- a/soh/soh/Enhancements/controls/Mouse.h +++ b/soh/soh/Enhancements/controls/Mouse.h @@ -1,6 +1,3 @@ -#ifndef MOUSE_H -#define MOUSE_H - #pragma once #include @@ -20,6 +17,3 @@ void Mouse_UpdateQuickspinCount(); #ifdef __cplusplus }; // extern "C" #endif - -// MOUSE_H -#endif diff --git a/soh/soh/Enhancements/cosmetics/cosmeticsTypes.h b/soh/soh/Enhancements/cosmetics/cosmeticsTypes.h index fec112c42c..960083be49 100644 --- a/soh/soh/Enhancements/cosmetics/cosmeticsTypes.h +++ b/soh/soh/Enhancements/cosmetics/cosmeticsTypes.h @@ -1,3 +1,5 @@ +#pragma once + typedef enum { COLORSCHEME_N64, COLORSCHEME_GAMECUBE, diff --git a/soh/soh/Enhancements/debugger/MessageViewer.h b/soh/soh/Enhancements/debugger/MessageViewer.h index 0faed49cc5..6881c5efea 100644 --- a/soh/soh/Enhancements/debugger/MessageViewer.h +++ b/soh/soh/Enhancements/debugger/MessageViewer.h @@ -1,5 +1,5 @@ -#ifndef CUSTOMMESSAGEDEBUGGER_H -#define CUSTOMMESSAGEDEBUGGER_H +#pragma once + #include "z64.h" #ifdef __cplusplus @@ -56,4 +56,3 @@ class MessageViewer final : public Ship::GuiWindow { }; #endif //__cplusplus -#endif // CUSTOMMESSAGEDEBUGGER_H diff --git a/soh/soh/Enhancements/debugger/SohConsoleWindow.h b/soh/soh/Enhancements/debugger/SohConsoleWindow.h index daf401451c..eab65fbdcb 100644 --- a/soh/soh/Enhancements/debugger/SohConsoleWindow.h +++ b/soh/soh/Enhancements/debugger/SohConsoleWindow.h @@ -1,5 +1,4 @@ -#ifndef SOH_CONSOLE_H -#define SOH_CONSOLE_H +#pragma once #include @@ -10,5 +9,3 @@ class SohConsoleWindow : public Ship::ConsoleWindow { protected: void DrawElement() override; }; - -#endif // SOH_CONSOLE_H diff --git a/soh/soh/Enhancements/debugger/SohGfxDebuggerWindow.h b/soh/soh/Enhancements/debugger/SohGfxDebuggerWindow.h index 9de2d752f1..cb8b72e804 100644 --- a/soh/soh/Enhancements/debugger/SohGfxDebuggerWindow.h +++ b/soh/soh/Enhancements/debugger/SohGfxDebuggerWindow.h @@ -1,5 +1,4 @@ -#ifndef SOH_GFX_DEBUGGER_H -#define SOH_GFX_DEBUGGER_H +#pragma once #include @@ -12,5 +11,3 @@ class SohGfxDebuggerWindow : public LUS::GfxDebuggerWindow { void UpdateElement() override; void DrawElement() override; }; - -#endif // SOH_GFX_DEBUGGER_H diff --git a/soh/soh/Enhancements/debugger/SohStatsWindow.h b/soh/soh/Enhancements/debugger/SohStatsWindow.h index ed1b1c6c59..2d5b191296 100644 --- a/soh/soh/Enhancements/debugger/SohStatsWindow.h +++ b/soh/soh/Enhancements/debugger/SohStatsWindow.h @@ -1,5 +1,4 @@ -#ifndef SOH_STATS_H -#define SOH_STATS_H +#pragma once #include @@ -13,5 +12,3 @@ class SohStatsWindow final : public Ship::GuiWindow { void DrawElement() override; void UpdateElement() override{}; }; - -#endif // SOH_STATS_H diff --git a/soh/soh/Enhancements/debugger/hookDebugger.h b/soh/soh/Enhancements/debugger/hookDebugger.h index 7cf22b1b0f..115153dda6 100644 --- a/soh/soh/Enhancements/debugger/hookDebugger.h +++ b/soh/soh/Enhancements/debugger/hookDebugger.h @@ -1,5 +1,4 @@ -#ifndef hookDebugger_h -#define hookDebugger_h +#pragma once #include @@ -11,5 +10,3 @@ class HookDebuggerWindow final : public Ship::GuiWindow { void DrawElement() override; void UpdateElement() override{}; }; - -#endif // hookDebugger_h diff --git a/soh/soh/Enhancements/enhancementTypes.h b/soh/soh/Enhancements/enhancementTypes.h index e235bba4a7..8ae8449357 100644 --- a/soh/soh/Enhancements/enhancementTypes.h +++ b/soh/soh/Enhancements/enhancementTypes.h @@ -1,5 +1,4 @@ -#ifndef _ENHANCEMENT_TYPES_H_ -#define _ENHANCEMENT_TYPES_H_ +#pragma once typedef enum { WARP_MODE_OVERRIDE_OFF, @@ -147,5 +146,3 @@ typedef enum { TELEPORT_TRAP_SIMPLE, TELEPORT_TRAP_ADVANCED, } TeleportTrapMode; - -#endif diff --git a/soh/soh/Enhancements/game-interactor/GameInteractionEffect.h b/soh/soh/Enhancements/game-interactor/GameInteractionEffect.h index 2db0fd30d3..d00c2de0b7 100644 --- a/soh/soh/Enhancements/game-interactor/GameInteractionEffect.h +++ b/soh/soh/Enhancements/game-interactor/GameInteractionEffect.h @@ -1,8 +1,5 @@ #pragma once -#ifndef GameInteractionEffect_h -#define GameInteractionEffect_h - #include #ifdef __cplusplus @@ -267,4 +264,3 @@ class SpawnActor : public GameInteractionEffectBase, public ParameterizedGameInt } // namespace GameInteractionEffect #endif /* __cplusplus */ -#endif /* GameInteractionEffect_h */ diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor.h b/soh/soh/Enhancements/game-interactor/GameInteractor.h index 683d1c0224..5b33b8cf5b 100644 --- a/soh/soh/Enhancements/game-interactor/GameInteractor.h +++ b/soh/soh/Enhancements/game-interactor/GameInteractor.h @@ -1,8 +1,5 @@ #pragma once -#ifndef GameInteractor_h -#define GameInteractor_h - #include #include "vanilla-behavior/GIVanillaBehavior.h" @@ -578,4 +575,3 @@ class GameInteractor { #undef GET_CURRENT_REGISTERING_INFO #endif /* __cplusplus */ -#endif /* GameInteractor_h */ diff --git a/soh/soh/Enhancements/game-interactor/vanilla-behavior/GIVanillaBehavior.h b/soh/soh/Enhancements/game-interactor/vanilla-behavior/GIVanillaBehavior.h index 1011a44d3a..5d0b6beacd 100644 --- a/soh/soh/Enhancements/game-interactor/vanilla-behavior/GIVanillaBehavior.h +++ b/soh/soh/Enhancements/game-interactor/vanilla-behavior/GIVanillaBehavior.h @@ -1,8 +1,5 @@ #pragma once -#ifndef GI_VANILLA_BEHAVIOR_H -#define GI_VANILLA_BEHAVIOR_H - typedef enum { // #### `result` // ```c @@ -3751,5 +3748,3 @@ typedef enum { // - `*EnBox` VB_CHEST_CONSIDER_CHEST_OPEN, } GIVanillaBehavior; - -#endif diff --git a/soh/soh/Enhancements/gameconsole.h b/soh/soh/Enhancements/gameconsole.h index 09d445f559..b92866041d 100644 --- a/soh/soh/Enhancements/gameconsole.h +++ b/soh/soh/Enhancements/gameconsole.h @@ -1,5 +1,4 @@ -#ifndef _GAMECONSOLE_H_ -#define _GAMECONSOLE_H_ +#pragma once #include #include @@ -36,5 +35,3 @@ s32 GameConsole_Split(char* str, char** argv); #ifdef __cplusplus } #endif - -#endif diff --git a/soh/soh/Enhancements/gameplaystatswindow.h b/soh/soh/Enhancements/gameplaystatswindow.h index 59cb6bfafe..b2fbe6ca40 100644 --- a/soh/soh/Enhancements/gameplaystatswindow.h +++ b/soh/soh/Enhancements/gameplaystatswindow.h @@ -1,3 +1,5 @@ +#pragma once + #include class GameplayStatsWindow final : public Ship::GuiWindow { diff --git a/soh/soh/Enhancements/kaleido.h b/soh/soh/Enhancements/kaleido.h index 922a1dac31..e7628dff77 100644 --- a/soh/soh/Enhancements/kaleido.h +++ b/soh/soh/Enhancements/kaleido.h @@ -1,5 +1,5 @@ -#ifndef KALEIDO_H -#define KALEIDO_H +#pragma once + #include #ifdef __cplusplus @@ -176,5 +176,3 @@ void RandoKaleido_UpdateMiscCollectibles(int16_t inDungeonScene); #ifdef __cplusplus } #endif - -#endif // KALEIDO_H diff --git a/soh/soh/Enhancements/nametag.h b/soh/soh/Enhancements/nametag.h index 95e335dcca..afc8b21768 100644 --- a/soh/soh/Enhancements/nametag.h +++ b/soh/soh/Enhancements/nametag.h @@ -1,5 +1,4 @@ -#ifndef NAMETAG_H -#define NAMETAG_H +#pragma once #include @@ -31,5 +30,3 @@ void NameTag_RemoveAllByTag(const char* tag); #ifdef __cplusplus } #endif - -#endif // NAMETAG_H diff --git a/soh/soh/Enhancements/randomizer/Plandomizer.h b/soh/soh/Enhancements/randomizer/Plandomizer.h index 1c45e2d8ba..6f9b2d23ea 100644 --- a/soh/soh/Enhancements/randomizer/Plandomizer.h +++ b/soh/soh/Enhancements/randomizer/Plandomizer.h @@ -1,6 +1,4 @@ #pragma once -#ifndef PLANDOMIZER_H -#define PLANDOMIZER_H #ifdef __cplusplus extern "C" { @@ -10,8 +8,6 @@ extern "C" { } #endif -#endif // PLANDOMIZER_H - #include #include "soh/Enhancements/randomizer/item.h" diff --git a/soh/soh/Enhancements/randomizer/RocsFeatherCycle.h b/soh/soh/Enhancements/randomizer/RocsFeatherCycle.h index 859cb5ab6f..b9c6b50c9c 100644 --- a/soh/soh/Enhancements/randomizer/RocsFeatherCycle.h +++ b/soh/soh/Enhancements/randomizer/RocsFeatherCycle.h @@ -1,9 +1,6 @@ -#ifndef ROCS_FEATHER_H -#define ROCS_FEATHER_H +#pragma once #include uint8_t Enhancement_GetNextNayrusItem(); uint8_t Enhancement_GetPrevNayrusItem(); - -#endif diff --git a/soh/soh/Enhancements/randomizer/ShuffleRocks.h b/soh/soh/Enhancements/randomizer/ShuffleRocks.h index c8c9a877b9..1c9d6135b1 100644 --- a/soh/soh/Enhancements/randomizer/ShuffleRocks.h +++ b/soh/soh/Enhancements/randomizer/ShuffleRocks.h @@ -1,5 +1,4 @@ -#ifndef SHUFFLEROCKS_H -#define SHUFFLEROCKS_H +#pragma once #ifdef __cplusplus extern "C" { @@ -8,5 +7,3 @@ void EnIshi_RandomizerInit(void* actorRef); #ifdef __cplusplus }; #endif - -#endif // SHUFFLEROCKS_H diff --git a/soh/soh/Enhancements/randomizer/ShuffleTradeItems.h b/soh/soh/Enhancements/randomizer/ShuffleTradeItems.h index a43f7de527..dbf54e5f62 100644 --- a/soh/soh/Enhancements/randomizer/ShuffleTradeItems.h +++ b/soh/soh/Enhancements/randomizer/ShuffleTradeItems.h @@ -1,5 +1,4 @@ -#ifndef Z_ADULT_TRADE_SHUFFLE_H -#define Z_ADULT_TRADE_SHUFFLE_H +#pragma once #include @@ -7,5 +6,3 @@ u8 Randomizer_GetNextChildTradeItem(); u8 Randomizer_GetPrevChildTradeItem(); u8 Randomizer_GetNextAdultTradeItem(); u8 Randomizer_GetPrevAdultTradeItem(); - -#endif diff --git a/soh/soh/Enhancements/randomizer/draw.h b/soh/soh/Enhancements/randomizer/draw.h index a9937afad9..05958dc8fd 100644 --- a/soh/soh/Enhancements/randomizer/draw.h +++ b/soh/soh/Enhancements/randomizer/draw.h @@ -1,5 +1,3 @@ -#ifndef RANDODRAW_H -#define RANDODRAW_H #pragma once #include "../item-tables/ItemTableTypes.h" @@ -45,5 +43,3 @@ void Randomizer_DrawStickBag(PlayState* play, GetItemEntry* getItemEntry); #ifdef __cplusplus }; #endif - -#endif diff --git a/soh/soh/Enhancements/randomizer/fishsanity.h b/soh/soh/Enhancements/randomizer/fishsanity.h index 8f5255807d..ef3ea6f8f8 100644 --- a/soh/soh/Enhancements/randomizer/fishsanity.h +++ b/soh/soh/Enhancements/randomizer/fishsanity.h @@ -1,5 +1,3 @@ -#ifndef FISHSANITY_H -#define FISHSANITY_H #pragma once #include @@ -209,5 +207,3 @@ void Fishsanity_CloseGreyscaleColor(PlayState* play); #ifdef __cplusplus } #endif - -#endif // FISHSANITY_H diff --git a/soh/soh/Enhancements/randomizer/item_category_adj.h b/soh/soh/Enhancements/randomizer/item_category_adj.h index 53a57e7d4f..8672b47e33 100644 --- a/soh/soh/Enhancements/randomizer/item_category_adj.h +++ b/soh/soh/Enhancements/randomizer/item_category_adj.h @@ -1,8 +1,5 @@ #pragma once -#ifndef ITEM_CATEGORY_ADJ_H -#define ITEM_CATEGORY_ADJ_H - #include "../item-tables/ItemTableTypes.h" #ifdef __cplusplus @@ -14,5 +11,3 @@ GetItemCategory Randomizer_AdjustItemCategory(GetItemEntry item); #ifdef __cplusplus } #endif - -#endif diff --git a/soh/soh/Enhancements/randomizer/option.h b/soh/soh/Enhancements/randomizer/option.h index b71038d1b1..e7f582b2db 100644 --- a/soh/soh/Enhancements/randomizer/option.h +++ b/soh/soh/Enhancements/randomizer/option.h @@ -1,8 +1,5 @@ #pragma once -#ifndef RANDOPTION_H -#define RANDOPTION_H - #include #include #include @@ -521,5 +518,3 @@ class OptionGroup { bool mDisabled = false; }; } // namespace Rando - -#endif // RANDOPTION_H \ No newline at end of file diff --git a/soh/soh/Enhancements/randomizer/rando_hash.h b/soh/soh/Enhancements/randomizer/rando_hash.h index 9c9526c28c..bdbf13fa90 100644 --- a/soh/soh/Enhancements/randomizer/rando_hash.h +++ b/soh/soh/Enhancements/randomizer/rando_hash.h @@ -1,8 +1,5 @@ #pragma once -#ifndef RANDOHASH_H -#define RANDOHASH_H - #include "randomizerTypes.h" #include #include @@ -110,4 +107,3 @@ inline std::array gSeedTextures = { { { dgQuestIconMagicJarSmallTex, 24, 24, G_IM_FMT_RGBA, G_IM_SIZ_32b, 98 }, { dgQuestIconMagicJarBigTex, 24, 24, G_IM_FMT_RGBA, G_IM_SIZ_32b, 99 }, } }; -#endif \ No newline at end of file diff --git a/soh/soh/Enhancements/randomizer/randomizer_entrance.h b/soh/soh/Enhancements/randomizer/randomizer_entrance.h index 7b87ce4914..cb6f474285 100644 --- a/soh/soh/Enhancements/randomizer/randomizer_entrance.h +++ b/soh/soh/Enhancements/randomizer/randomizer_entrance.h @@ -1,5 +1,4 @@ -#ifndef _RANDO_ENTRANCE_H_ -#define _RANDO_ENTRANCE_H_ +#pragma once #include @@ -55,5 +54,3 @@ void Entrance_SetEntranceDiscovered(uint16_t entranceIndex, uint8_t isReversedEn #ifdef __cplusplus } #endif - -#endif //_RANDO_ENTRANCE_H_ diff --git a/soh/soh/Enhancements/randomizer/randomizer_grotto.h b/soh/soh/Enhancements/randomizer/randomizer_grotto.h index 8da99ac042..103bc645c3 100644 --- a/soh/soh/Enhancements/randomizer/randomizer_grotto.h +++ b/soh/soh/Enhancements/randomizer/randomizer_grotto.h @@ -1,5 +1,4 @@ -#ifndef _RANDO_GROTTO_H_ -#define _RANDO_GROTTO_H_ +#pragma once #include "z64math.h" #include "z64actor.h" @@ -40,5 +39,3 @@ s8 Grotto_CurrentGrotto(); #ifdef __cplusplus }; #endif - -#endif //_RANDO_GROTTO_H_ diff --git a/soh/soh/Enhancements/randomizer/savefile.h b/soh/soh/Enhancements/randomizer/savefile.h index 520db19825..fe0eb186cb 100644 --- a/soh/soh/Enhancements/randomizer/savefile.h +++ b/soh/soh/Enhancements/randomizer/savefile.h @@ -1,5 +1,4 @@ -#ifndef RANDOSAVEFILE_H -#define RANDOSAVEFILE_H +#pragma once #ifdef __cplusplus extern "C" { @@ -10,5 +9,3 @@ void Randomizer_InitSaveFile(); #ifdef __cplusplus } #endif - -#endif diff --git a/soh/soh/Enhancements/randomizer/tricks.h b/soh/soh/Enhancements/randomizer/tricks.h index 066dd44171..0bd2b93593 100644 --- a/soh/soh/Enhancements/randomizer/tricks.h +++ b/soh/soh/Enhancements/randomizer/tricks.h @@ -1,8 +1,5 @@ #pragma once -#ifndef TRICKS_H -#define TRICKS_H - #include #include "randomizerTypes.h" @@ -31,5 +28,3 @@ class Tricks { static void DrawTagChips(const std::set& rtTags, std::string trickName = ""); }; } // namespace Rando - -#endif // TRICKS_H \ No newline at end of file diff --git a/soh/soh/Enhancements/savestates.h b/soh/soh/Enhancements/savestates.h index 0fe4a9ce52..6cfa599218 100644 --- a/soh/soh/Enhancements/savestates.h +++ b/soh/soh/Enhancements/savestates.h @@ -1,5 +1,4 @@ -#ifndef SAVE_STATES_H -#define SAVE_STATES_H +#pragma once #include #include @@ -57,5 +56,3 @@ class SaveStateMgr { void ProcessSaveStateRequests(void); }; extern std::shared_ptr gSaveStateMgr; - -#endif diff --git a/soh/soh/Enhancements/speechsynthesizer/DarwinSpeechSynthesizer.h b/soh/soh/Enhancements/speechsynthesizer/DarwinSpeechSynthesizer.h index 623fd8e01d..c91688ac6d 100644 --- a/soh/soh/Enhancements/speechsynthesizer/DarwinSpeechSynthesizer.h +++ b/soh/soh/Enhancements/speechsynthesizer/DarwinSpeechSynthesizer.h @@ -5,8 +5,7 @@ // Created by David Chavez on 22.11.22. // -#ifndef SOHDarwinSpeechSynthesizer_h -#define SOHDarwinSpeechSynthesizer_h +#pragma once #include "SpeechSynthesizer.h" @@ -23,5 +22,3 @@ class DarwinSpeechSynthesizer : public SpeechSynthesizer { private: void* mSynthesizer; }; - -#endif /* DarwinSpeechSynthesizer_h */ diff --git a/soh/soh/Enhancements/speechsynthesizer/SAPISpeechSynthesizer.h b/soh/soh/Enhancements/speechsynthesizer/SAPISpeechSynthesizer.h index c5dfb59b9a..4d1c3c6467 100644 --- a/soh/soh/Enhancements/speechsynthesizer/SAPISpeechSynthesizer.h +++ b/soh/soh/Enhancements/speechsynthesizer/SAPISpeechSynthesizer.h @@ -5,8 +5,7 @@ // Created by David Chavez on 22.11.22. // -#ifndef SOHSAPISpeechSynthesizer_h -#define SOHSAPISpeechSynthesizer_h +#pragma once #include "SpeechSynthesizer.h" #include @@ -21,5 +20,3 @@ class SAPISpeechSynthesizer : public SpeechSynthesizer { bool DoInit(void); void DoUninitialize(void); }; - -#endif /* SAPISpeechSynthesizer_h */ diff --git a/soh/soh/Enhancements/speechsynthesizer/SpeechLogger.h b/soh/soh/Enhancements/speechsynthesizer/SpeechLogger.h index 3be27945fa..4fc8a5823a 100644 --- a/soh/soh/Enhancements/speechsynthesizer/SpeechLogger.h +++ b/soh/soh/Enhancements/speechsynthesizer/SpeechLogger.h @@ -1,5 +1,4 @@ -#ifndef SOHSpeechLogger_h -#define SOHSpeechLogger_h +#pragma once #include "SpeechSynthesizer.h" @@ -13,5 +12,3 @@ class SpeechLogger : public SpeechSynthesizer { bool DoInit(void); void DoUninitialize(void); }; - -#endif diff --git a/soh/soh/Enhancements/speechsynthesizer/SpeechSynthesizer.h b/soh/soh/Enhancements/speechsynthesizer/SpeechSynthesizer.h index 5456e9611b..0a4ed241bf 100644 --- a/soh/soh/Enhancements/speechsynthesizer/SpeechSynthesizer.h +++ b/soh/soh/Enhancements/speechsynthesizer/SpeechSynthesizer.h @@ -5,8 +5,7 @@ // Created by David Chavez on 22.11.22. // -#ifndef SOHSpeechSynthesizer_h -#define SOHSpeechSynthesizer_h +#pragma once class SpeechSynthesizer { public: @@ -27,8 +26,6 @@ class SpeechSynthesizer { bool mInitialized; }; -#endif /* SpeechSynthesizer_h */ - #ifdef _WIN32 #include "SAPISpeechSynthesizer.h" #elif defined(__APPLE__) diff --git a/soh/soh/Enhancements/timesplits/TimeSplits.h b/soh/soh/Enhancements/timesplits/TimeSplits.h index a005e568d8..4a4828a373 100644 --- a/soh/soh/Enhancements/timesplits/TimeSplits.h +++ b/soh/soh/Enhancements/timesplits/TimeSplits.h @@ -1,6 +1,4 @@ #pragma once -#ifndef TIMESPLITS_H -#define TIMESPLITS_H #include @@ -54,5 +52,3 @@ typedef struct { } SplitObject; #endif - -#endif // TIMESPLITS_H diff --git a/soh/soh/Extractor/Extract.h b/soh/soh/Extractor/Extract.h index 5ec3160864..71823405c5 100644 --- a/soh/soh/Extractor/Extract.h +++ b/soh/soh/Extractor/Extract.h @@ -1,5 +1,4 @@ -#ifndef EXTRACT_H -#define EXTRACT_H +#pragma once #include #include @@ -67,4 +66,3 @@ class Extractor { std::atomic* totalExtract); std::string Mkdtemp(); }; -#endif diff --git a/soh/soh/Extractor/TorchExtract.h b/soh/soh/Extractor/TorchExtract.h index f2f3647ee4..958adfe85e 100644 --- a/soh/soh/Extractor/TorchExtract.h +++ b/soh/soh/Extractor/TorchExtract.h @@ -1,5 +1,4 @@ -#ifndef TORCHEXTRACT_H -#define TORCHEXTRACT_H +#pragma once #include #include @@ -20,5 +19,3 @@ std::string Extract(const std::string& romPath, const std::string& srcDir, const const std::string& portVersion, std::atomic* progress); } // namespace SohTorch - -#endif diff --git a/soh/soh/GameVersions.h b/soh/soh/GameVersions.h index ce532d2eb0..1e52bd99f5 100644 --- a/soh/soh/GameVersions.h +++ b/soh/soh/GameVersions.h @@ -1,6 +1,3 @@ -#ifndef GAME_VERSION_H -#define GAME_VERSION_H - #pragma once #define OOT_NTSC_US_10 0xEC7011B7 @@ -24,5 +21,3 @@ #define OOT_IQUE_TW 0x3D81FB3E #define OOT_IQUE_CN 0xB1E1E07B #define UNKNOWN_GAME_VERSION 0xFFFFFFFF - -#endif diff --git a/soh/soh/Network/Anchor/Anchor.h b/soh/soh/Network/Anchor/Anchor.h index ae79228472..9cd7608be5 100644 --- a/soh/soh/Network/Anchor/Anchor.h +++ b/soh/soh/Network/Anchor/Anchor.h @@ -1,5 +1,5 @@ -#ifndef NETWORK_ANCHOR_H -#define NETWORK_ANCHOR_H +#pragma once + #ifdef __cplusplus #include "soh/Network/Network.h" @@ -196,4 +196,3 @@ class AnchorRoomWindow : public Ship::GuiWindow { }; #endif // __cplusplus -#endif // NETWORK_ANCHOR_H diff --git a/soh/soh/Network/Anchor/JsonConversions.hpp b/soh/soh/Network/Anchor/JsonConversions.hpp index f2720058af..83c2f77304 100644 --- a/soh/soh/Network/Anchor/JsonConversions.hpp +++ b/soh/soh/Network/Anchor/JsonConversions.hpp @@ -1,5 +1,5 @@ -#ifndef NETWORK_ANCHOR_JSON_CONVERSIONS_H -#define NETWORK_ANCHOR_JSON_CONVERSIONS_H +#pragma once + #ifdef __cplusplus #include @@ -209,4 +209,3 @@ inline void from_json(const json& j, SaveContext& saveContext) { } #endif // __cplusplus -#endif // NETWORK_ANCHOR_JSON_CONVERSIONS_H diff --git a/soh/soh/Network/CrowdControl/CrowdControl.h b/soh/soh/Network/CrowdControl/CrowdControl.h index 627f436165..5ec7e157f5 100644 --- a/soh/soh/Network/CrowdControl/CrowdControl.h +++ b/soh/soh/Network/CrowdControl/CrowdControl.h @@ -1,5 +1,5 @@ -#ifndef NETWORK_CROWD_CONTROL_H -#define NETWORK_CROWD_CONTROL_H +#pragma once + #ifdef __cplusplus #include @@ -87,4 +87,3 @@ class CrowdControl : public Network { }; #endif // __cplusplus -#endif // NETWORK_CROWD_CONTROL_H diff --git a/soh/soh/Network/Network.h b/soh/soh/Network/Network.h index ea876dc4df..e49b909e57 100644 --- a/soh/soh/Network/Network.h +++ b/soh/soh/Network/Network.h @@ -1,5 +1,5 @@ -#ifndef NETWORK_H -#define NETWORK_H +#pragma once + #ifdef __cplusplus #include @@ -46,4 +46,3 @@ class Network { }; #endif // __cplusplus -#endif // NETWORK_H diff --git a/soh/soh/Network/Sail/Sail.h b/soh/soh/Network/Sail/Sail.h index c04bf897fc..9b26c23270 100644 --- a/soh/soh/Network/Sail/Sail.h +++ b/soh/soh/Network/Sail/Sail.h @@ -1,5 +1,5 @@ -#ifndef NETWORK_SAIL_H -#define NETWORK_SAIL_H +#pragma once + #ifdef __cplusplus #include @@ -23,4 +23,3 @@ class Sail : public Network { }; #endif // __cplusplus -#endif // NETWORK_SAIL_H diff --git a/soh/soh/Notification/Notification.h b/soh/soh/Notification/Notification.h index 9550572626..cb7e5063b9 100644 --- a/soh/soh/Notification/Notification.h +++ b/soh/soh/Notification/Notification.h @@ -1,5 +1,5 @@ -#ifndef NOTIFICATION_H -#define NOTIFICATION_H +#pragma once + #ifdef __cplusplus #include @@ -35,4 +35,3 @@ void Emit(Options notification); } // namespace Notification #endif // __cplusplus -#endif // NOTIFICATION_H diff --git a/soh/soh/ObjectExtension/ActorListIndex.h b/soh/soh/ObjectExtension/ActorListIndex.h index 84f00449d0..3870cab7a0 100644 --- a/soh/soh/ObjectExtension/ActorListIndex.h +++ b/soh/soh/ObjectExtension/ActorListIndex.h @@ -1,5 +1,4 @@ -#ifndef ACTOR_LIST_INDEX_H -#define ACTOR_LIST_INDEX_H +#pragma once #ifdef __cplusplus extern "C" { @@ -12,5 +11,3 @@ void SetActorListIndex(const Actor* actor, int16_t index); #ifdef __cplusplus } #endif - -#endif // ACTOR_LIST_INDEX_H \ No newline at end of file diff --git a/soh/soh/ObjectExtension/ActorMaximumHealth.h b/soh/soh/ObjectExtension/ActorMaximumHealth.h index d3ee67acdf..cf6c9aa3e7 100644 --- a/soh/soh/ObjectExtension/ActorMaximumHealth.h +++ b/soh/soh/ObjectExtension/ActorMaximumHealth.h @@ -1,5 +1,4 @@ -#ifndef ACTOR_MAXIMUM_HEALTH_H -#define ACTOR_MAXIMUM_HEALTH_H +#pragma once #ifdef __cplusplus extern "C" { @@ -13,5 +12,3 @@ void SetActorMaximumHealth(const Actor* actor, u8 maximumHealth); #ifdef __cplusplus } #endif - -#endif // ACTOR_MAXIMUM_HEALTH_H \ No newline at end of file diff --git a/soh/soh/ShipInit.hpp b/soh/soh/ShipInit.hpp index e96e77f914..bddb77e8a0 100644 --- a/soh/soh/ShipInit.hpp +++ b/soh/soh/ShipInit.hpp @@ -1,5 +1,4 @@ -#ifndef SHIP_INIT_HPP -#define SHIP_INIT_HPP +#pragma once #ifdef __cplusplus @@ -71,5 +70,3 @@ struct RegisterShipInitFunc { }; #endif // __cplusplus - -#endif // SHIP_INIT_HPP diff --git a/soh/soh/ShipUtils.h b/soh/soh/ShipUtils.h index fdcc2a9126..26ca532d4a 100644 --- a/soh/soh/ShipUtils.h +++ b/soh/soh/ShipUtils.h @@ -1,5 +1,4 @@ -#ifndef SHIP_UTILS_H -#define SHIP_UTILS_H +#pragma once #include @@ -76,5 +75,3 @@ template void Shuffle(std::array& arr, uint64 } } // namespace ShipUtils #endif - -#endif // SHIP_UTILS_H diff --git a/soh/soh/SohGui/BackendTypes.h b/soh/soh/SohGui/BackendTypes.h index 85b327c51b..574bfa6ff0 100644 --- a/soh/soh/SohGui/BackendTypes.h +++ b/soh/soh/SohGui/BackendTypes.h @@ -1,5 +1,4 @@ -#ifndef SHIP_BACKENDTYPES_H -#define SHIP_BACKENDTYPES_H +#pragma once #include #include @@ -16,5 +15,3 @@ static const std::map windowBackendsMap = { { Fast::WindowBackend::FAST3D_SDL_OPENGL, "OpenGL" }, { Fast::WindowBackend::FAST3D_SDL_METAL, "Metal" }, }; - -#endif // SHIP_BACKENDTYPES_H diff --git a/soh/soh/SohGui/ImGuiUtils.h b/soh/soh/SohGui/ImGuiUtils.h index aaa1514085..89a61b722b 100644 --- a/soh/soh/SohGui/ImGuiUtils.h +++ b/soh/soh/SohGui/ImGuiUtils.h @@ -1,6 +1,3 @@ -#ifndef IM_GUI_UTILS_H -#define IM_GUI_UTILS_H - #pragma once #include @@ -68,5 +65,3 @@ extern std::map songMapping; // Maps song ids to info for use in ImGui extern std::array vanillaSongMapping; - -#endif // IM_GUI_UTILS_H \ No newline at end of file diff --git a/soh/soh/SohGui/Menu.h b/soh/soh/SohGui/Menu.h index 988d969a2d..4a771ad334 100644 --- a/soh/soh/SohGui/Menu.h +++ b/soh/soh/SohGui/Menu.h @@ -1,5 +1,4 @@ -#ifndef MENU_H -#define MENU_H +#pragma once #include #include @@ -68,5 +67,3 @@ class Menu : public GuiWindow { UIWidgets::Colors menuThemeIndex; }; } // namespace Ship - -#endif // MENU_H diff --git a/soh/soh/SohGui/MenuTypes.h b/soh/soh/SohGui/MenuTypes.h index a1a074e83d..818381e42c 100644 --- a/soh/soh/SohGui/MenuTypes.h +++ b/soh/soh/SohGui/MenuTypes.h @@ -1,5 +1,4 @@ -#ifndef MENUTYPES_H -#define MENUTYPES_H +#pragma once #include @@ -319,5 +318,3 @@ struct RegisterMenuUpdateFunc { menuUpdateFuncs[sectionName][sidebarName].push_back(updateFunc); } }; - -#endif // MENUTYPES_H diff --git a/soh/soh/SohGui/ResolutionEditor.h b/soh/soh/SohGui/ResolutionEditor.h index 55f728ce03..18531978cb 100644 --- a/soh/soh/SohGui/ResolutionEditor.h +++ b/soh/soh/SohGui/ResolutionEditor.h @@ -1,10 +1,7 @@ -#ifndef RESOLUTIONEDITOR_H -#define RESOLUTIONEDITOR_H +#pragma once namespace SohGui { bool IsDroppingFrames(); void RegisterResolutionWidgets(); void UpdateResolutionVars(); } // namespace SohGui - -#endif // RESOLUTIONEDITOR_H diff --git a/soh/soh/SohGui/SohGui.hpp b/soh/soh/SohGui/SohGui.hpp index 8c5129fee9..ca3032f891 100644 --- a/soh/soh/SohGui/SohGui.hpp +++ b/soh/soh/SohGui/SohGui.hpp @@ -5,8 +5,7 @@ // Created by David Chavez on 24.08.22. // -#ifndef SohGui_hpp -#define SohGui_hpp +#pragma once #include "SohMenu.h" #include "soh/Enhancements/audio/AudioEditor.h" @@ -49,5 +48,3 @@ void DrawStartingItemsMenu(WidgetInfo& info); } // namespace SohGui #define THEME_COLOR SohGui::GetMenuThemeColor() - -#endif /* SohGui_hpp */ diff --git a/soh/soh/SohGui/SohMenu.h b/soh/soh/SohGui/SohMenu.h index 9cae3bd240..feec116adf 100644 --- a/soh/soh/SohGui/SohMenu.h +++ b/soh/soh/SohGui/SohMenu.h @@ -1,5 +1,4 @@ -#ifndef SOHMENU_H -#define SOHMENU_H +#pragma once #include "Menu.h" @@ -52,5 +51,3 @@ class SohMenu : public Ship::Menu { bool mMenuElementsInitialized = false; }; } // namespace SohGui - -#endif // SOHMENU_H diff --git a/soh/soh/SohGui/UIWidgetOptions.hpp b/soh/soh/SohGui/UIWidgetOptions.hpp index 7b5e66b595..9d6c187389 100644 --- a/soh/soh/SohGui/UIWidgetOptions.hpp +++ b/soh/soh/SohGui/UIWidgetOptions.hpp @@ -1,5 +1,4 @@ -#ifndef UIWidgetOptions_hpp -#define UIWidgetOptions_hpp +#pragma once #include #include @@ -589,5 +588,4 @@ struct InputOptions : WidgetOptions { return *this; } }; -}; // namespace UIWidgets -#endif /* UIWidgetOptions_hpp */ +}; // namespace UIWidgets diff --git a/soh/soh/SohGui/UIWidgets.hpp b/soh/soh/SohGui/UIWidgets.hpp index 3e90bcebcd..c8961487f8 100644 --- a/soh/soh/SohGui/UIWidgets.hpp +++ b/soh/soh/SohGui/UIWidgets.hpp @@ -1,5 +1,4 @@ -#ifndef UIWidgets2_hpp -#define UIWidgets2_hpp +#pragma once #include "UIWidgetOptions.hpp" @@ -552,5 +551,3 @@ ImVec4 GetRandomValue(uint64_t* state = nullptr); Color_RGBA8 RGBA8FromVec(ImVec4 vec); ImVec4 VecFromRGBA8(Color_RGBA8 color); - -#endif /* UIWidgets_hpp */ diff --git a/soh/soh/config/ConfigUpdaters.h b/soh/soh/config/ConfigUpdaters.h index 069c4ee0ec..189bf99d62 100644 --- a/soh/soh/config/ConfigUpdaters.h +++ b/soh/soh/config/ConfigUpdaters.h @@ -1,3 +1,5 @@ +#pragma once + #include namespace SOH { diff --git a/soh/soh/cvar_prefixes.h b/soh/soh/cvar_prefixes.h index 395fe2bbea..c9183a4d09 100644 --- a/soh/soh/cvar_prefixes.h +++ b/soh/soh/cvar_prefixes.h @@ -1,3 +1,5 @@ +#pragma once + #define CVAR_RANDOMIZER_ENHANCEMENT(var) CVAR_PREFIX_RANDOMIZER_ENHANCEMENT "." var #define CVAR_RANDOMIZER_SETTING(var) CVAR_PREFIX_RANDOMIZER_SETTING "." var #define CVAR_COSMETIC(var) CVAR_PREFIX_COSMETIC "." var diff --git a/soh/soh/framebuffer_effects.h b/soh/soh/framebuffer_effects.h index badbc38589..60ffbf428a 100644 --- a/soh/soh/framebuffer_effects.h +++ b/soh/soh/framebuffer_effects.h @@ -1,5 +1,4 @@ -#ifndef FRAMEBUFFER_EFFECTS_H -#define FRAMEBUFFER_EFFECTS_H +#pragma once #include @@ -13,5 +12,3 @@ void FB_CopyToFramebuffer(Gfx** gfxp, s32 fb_src, s32 fb_dest, u8 oncePerFrame, void FB_WriteFramebufferSliceToCPU(Gfx** gfxp, void* buffer, u8 byteSwap); void FB_DrawFromFramebuffer(Gfx** gfxp, s32 fb, u8 alpha); void FB_DrawFromFramebufferScaled(Gfx** gfxp, s32 fb, u8 alpha, float scaleX, float scaleY); - -#endif // FRAMEBUFFER_EFFECTS_H diff --git a/soh/soh/mq_asset_hacks.h b/soh/soh/mq_asset_hacks.h index 4ffcecb5dc..c12f5b2dde 100644 --- a/soh/soh/mq_asset_hacks.h +++ b/soh/soh/mq_asset_hacks.h @@ -1,5 +1,4 @@ -#ifndef MQ_ASSET_HACKS_H -#define MQ_ASSET_HACKS_H +#pragma once #include "align_asset_macro.h" @@ -100,5 +99,3 @@ void* sSpiritTempleEntranceTextures_MQ[] = { gSpiritTempleDayEntranceTex_MQ, gSpiritTempleNightEntranceTex_MQ, }; - -#endif diff --git a/soh/soh/resource/logging/PathLogger.h b/soh/soh/resource/logging/PathLogger.h index 23f4f0d30f..f9bfcb2527 100644 --- a/soh/soh/resource/logging/PathLogger.h +++ b/soh/soh/resource/logging/PathLogger.h @@ -1,3 +1,5 @@ +#pragma once + #include #include "soh/OTRGlobals.h" #include "soh/cvar_prefixes.h" diff --git a/soh/soh/resource/logging/SceneCommandLoggers.h b/soh/soh/resource/logging/SceneCommandLoggers.h index 64dc1d9952..d5790044d4 100644 --- a/soh/soh/resource/logging/SceneCommandLoggers.h +++ b/soh/soh/resource/logging/SceneCommandLoggers.h @@ -1,3 +1,5 @@ +#pragma once + #include #include "soh/OTRGlobals.h" #include "soh/cvar_prefixes.h"