From ba123d42e1dafafc1b66e16542bb433abfce1314 Mon Sep 17 00:00:00 2001 From: Demur Rumed <159546+serprex@users.noreply.github.com> Date: Sat, 30 May 2026 14:12:52 +0000 Subject: [PATCH] OTRGlobals.h: include stdint.h standardize on stdint.h over cstdint --- soh/soh/Enhancements/audio/AudioCollection.h | 2 +- soh/soh/Enhancements/audio/AudioEditor.h | 2 +- soh/soh/Enhancements/controls/SohInputEditorWindow.h | 2 +- soh/soh/Enhancements/custom-message/CustomMessageManager.h | 2 +- soh/soh/Enhancements/debugconsole.h | 2 +- soh/soh/Enhancements/debugger/debugSaveEditor.h | 2 +- soh/soh/Enhancements/randomizer/3drando/random.hpp | 2 +- soh/soh/Enhancements/randomizer/logic.h | 2 +- soh/soh/Enhancements/randomizer/option.h | 2 +- soh/soh/Enhancements/randomizer/randomizer_entrance_tracker.h | 2 +- soh/soh/Enhancements/randomizer/randomizer_item_tracker.h | 2 +- soh/soh/Enhancements/savestates.h | 2 +- soh/soh/OTRGlobals.h | 3 ++- soh/soh/resource/type/AudioSample.h | 2 +- soh/soh/resource/type/AudioSequence.h | 2 +- soh/soh/resource/type/AudioSoundFont.h | 2 +- soh/soh/resource/type/CollisionHeader.h | 2 +- soh/soh/resource/type/Path.h | 2 +- soh/soh/resource/type/Scene.h | 2 +- soh/soh/resource/type/Skeleton.h | 2 +- soh/soh/resource/type/Text.h | 2 +- soh/soh/resource/type/scenecommand/EndMarker.h | 2 +- soh/soh/resource/type/scenecommand/RomFile.h | 2 +- soh/soh/resource/type/scenecommand/SceneCommand.h | 2 +- soh/soh/resource/type/scenecommand/SetActorList.h | 2 +- soh/soh/resource/type/scenecommand/SetAlternateHeaders.h | 2 +- soh/soh/resource/type/scenecommand/SetCameraSettings.h | 2 +- soh/soh/resource/type/scenecommand/SetCollisionHeader.h | 2 +- soh/soh/resource/type/scenecommand/SetCsCamera.h | 2 +- soh/soh/resource/type/scenecommand/SetCutscenes.h | 2 +- soh/soh/resource/type/scenecommand/SetEchoSettings.h | 2 +- soh/soh/resource/type/scenecommand/SetEntranceList.h | 2 +- soh/soh/resource/type/scenecommand/SetExitList.h | 2 +- soh/soh/resource/type/scenecommand/SetLightList.h | 2 +- soh/soh/resource/type/scenecommand/SetLightingSettings.h | 2 +- soh/soh/resource/type/scenecommand/SetMesh.h | 2 +- soh/soh/resource/type/scenecommand/SetObjectList.h | 2 +- soh/soh/resource/type/scenecommand/SetPathways.h | 2 +- soh/soh/resource/type/scenecommand/SetRoomBehavior.h | 2 +- soh/soh/resource/type/scenecommand/SetRoomList.h | 2 +- soh/soh/resource/type/scenecommand/SetSkyboxModifier.h | 2 +- soh/soh/resource/type/scenecommand/SetSkyboxSettings.h | 2 +- soh/soh/resource/type/scenecommand/SetSoundSettings.h | 2 +- soh/soh/resource/type/scenecommand/SetSpecialObjects.h | 2 +- soh/soh/resource/type/scenecommand/SetStartPositionList.h | 2 +- soh/soh/resource/type/scenecommand/SetTimeSettings.h | 2 +- soh/soh/resource/type/scenecommand/SetTransitionActorList.h | 2 +- soh/soh/resource/type/scenecommand/SetWindSettings.h | 2 +- 48 files changed, 49 insertions(+), 48 deletions(-) diff --git a/soh/soh/Enhancements/audio/AudioCollection.h b/soh/soh/Enhancements/audio/AudioCollection.h index 5659de99fa5..391e9c7b440 100644 --- a/soh/soh/Enhancements/audio/AudioCollection.h +++ b/soh/soh/Enhancements/audio/AudioCollection.h @@ -3,7 +3,7 @@ #include #include #include -#include +#include enum SeqType { SEQ_NOSHUFFLE = 0, diff --git a/soh/soh/Enhancements/audio/AudioEditor.h b/soh/soh/Enhancements/audio/AudioEditor.h index b05c7b88e2e..d308c9bd356 100644 --- a/soh/soh/Enhancements/audio/AudioEditor.h +++ b/soh/soh/Enhancements/audio/AudioEditor.h @@ -1,5 +1,5 @@ #pragma once -#include "stdint.h" +#include #ifdef __cplusplus diff --git a/soh/soh/Enhancements/controls/SohInputEditorWindow.h b/soh/soh/Enhancements/controls/SohInputEditorWindow.h index a6815f060aa..53d8861c68d 100644 --- a/soh/soh/Enhancements/controls/SohInputEditorWindow.h +++ b/soh/soh/Enhancements/controls/SohInputEditorWindow.h @@ -1,6 +1,6 @@ #pragma once -#include "stdint.h" +#include #include #include #include diff --git a/soh/soh/Enhancements/custom-message/CustomMessageManager.h b/soh/soh/Enhancements/custom-message/CustomMessageManager.h index d69f81ea6af..792bfad3fb8 100644 --- a/soh/soh/Enhancements/custom-message/CustomMessageManager.h +++ b/soh/soh/Enhancements/custom-message/CustomMessageManager.h @@ -1,6 +1,6 @@ #pragma once #include -#include +#include #include #include #include diff --git a/soh/soh/Enhancements/debugconsole.h b/soh/soh/Enhancements/debugconsole.h index 148dadcbc25..c41c641bb76 100644 --- a/soh/soh/Enhancements/debugconsole.h +++ b/soh/soh/Enhancements/debugconsole.h @@ -1,5 +1,5 @@ #pragma once -#include "stdint.h" +#include void DebugConsole_Init(void); diff --git a/soh/soh/Enhancements/debugger/debugSaveEditor.h b/soh/soh/Enhancements/debugger/debugSaveEditor.h index 6e692963fed..856b3002a3c 100644 --- a/soh/soh/Enhancements/debugger/debugSaveEditor.h +++ b/soh/soh/Enhancements/debugger/debugSaveEditor.h @@ -3,7 +3,7 @@ #include #include #include -#include +#include #include "soh/Enhancements/randomizer/randomizerTypes.h" #include diff --git a/soh/soh/Enhancements/randomizer/3drando/random.hpp b/soh/soh/Enhancements/randomizer/3drando/random.hpp index b08e7807f40..5c8eefd3b57 100644 --- a/soh/soh/Enhancements/randomizer/3drando/random.hpp +++ b/soh/soh/Enhancements/randomizer/3drando/random.hpp @@ -3,7 +3,7 @@ #include "soh/ShipUtils.h" #include #include -#include +#include #include #include #include diff --git a/soh/soh/Enhancements/randomizer/logic.h b/soh/soh/Enhancements/randomizer/logic.h index 3f4b4a206cf..00882e81c6c 100644 --- a/soh/soh/Enhancements/randomizer/logic.h +++ b/soh/soh/Enhancements/randomizer/logic.h @@ -2,7 +2,7 @@ #include "randomizerTypes.h" #include "SeedContext.h" -#include +#include namespace Rando { diff --git a/soh/soh/Enhancements/randomizer/option.h b/soh/soh/Enhancements/randomizer/option.h index fff4b265557..6f32418b245 100644 --- a/soh/soh/Enhancements/randomizer/option.h +++ b/soh/soh/Enhancements/randomizer/option.h @@ -3,7 +3,7 @@ #ifndef RANDOPTION_H #define RANDOPTION_H -#include +#include #include #include #include diff --git a/soh/soh/Enhancements/randomizer/randomizer_entrance_tracker.h b/soh/soh/Enhancements/randomizer/randomizer_entrance_tracker.h index 036630e90d6..281b6f6d990 100644 --- a/soh/soh/Enhancements/randomizer/randomizer_entrance_tracker.h +++ b/soh/soh/Enhancements/randomizer/randomizer_entrance_tracker.h @@ -2,7 +2,7 @@ #include #include -#include +#include #include #include "randomizerTypes.h" diff --git a/soh/soh/Enhancements/randomizer/randomizer_item_tracker.h b/soh/soh/Enhancements/randomizer/randomizer_item_tracker.h index fab47c9531f..0538e9f71ad 100644 --- a/soh/soh/Enhancements/randomizer/randomizer_item_tracker.h +++ b/soh/soh/Enhancements/randomizer/randomizer_item_tracker.h @@ -2,7 +2,7 @@ #include #include -#include +#include #include void DrawItemAmmo(int itemId); diff --git a/soh/soh/Enhancements/savestates.h b/soh/soh/Enhancements/savestates.h index 4cf0353628c..0fe4a9ce520 100644 --- a/soh/soh/Enhancements/savestates.h +++ b/soh/soh/Enhancements/savestates.h @@ -1,7 +1,7 @@ #ifndef SAVE_STATES_H #define SAVE_STATES_H -#include +#include #include #include #include diff --git a/soh/soh/OTRGlobals.h b/soh/soh/OTRGlobals.h index b36b5114d27..a0f797157bd 100644 --- a/soh/soh/OTRGlobals.h +++ b/soh/soh/OTRGlobals.h @@ -16,7 +16,8 @@ #define M_PI_2f 1.57079632679489661923f // pi/2 #ifdef __cplusplus -#include // for shared_ptr +#include +#include #include #include diff --git a/soh/soh/resource/type/AudioSample.h b/soh/soh/resource/type/AudioSample.h index eb29bc5bce2..b07523bc441 100644 --- a/soh/soh/resource/type/AudioSample.h +++ b/soh/soh/resource/type/AudioSample.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include diff --git a/soh/soh/resource/type/AudioSequence.h b/soh/soh/resource/type/AudioSequence.h index 90d5dd15e09..96f20228072 100644 --- a/soh/soh/resource/type/AudioSequence.h +++ b/soh/soh/resource/type/AudioSequence.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include namespace SOH { diff --git a/soh/soh/resource/type/AudioSoundFont.h b/soh/soh/resource/type/AudioSoundFont.h index 0e07c03083c..0f66d927a97 100644 --- a/soh/soh/resource/type/AudioSoundFont.h +++ b/soh/soh/resource/type/AudioSoundFont.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include #include "soh/resource/type/AudioSample.h" diff --git a/soh/soh/resource/type/CollisionHeader.h b/soh/soh/resource/type/CollisionHeader.h index d6cd3c6fd84..7479de99eac 100644 --- a/soh/soh/resource/type/CollisionHeader.h +++ b/soh/soh/resource/type/CollisionHeader.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include #include diff --git a/soh/soh/resource/type/Path.h b/soh/soh/resource/type/Path.h index 42fc2946fb8..a5b821ebdf0 100644 --- a/soh/soh/resource/type/Path.h +++ b/soh/soh/resource/type/Path.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include #include diff --git a/soh/soh/resource/type/Scene.h b/soh/soh/resource/type/Scene.h index 371890e7644..6394bff5e10 100644 --- a/soh/soh/resource/type/Scene.h +++ b/soh/soh/resource/type/Scene.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include #include diff --git a/soh/soh/resource/type/Skeleton.h b/soh/soh/resource/type/Skeleton.h index 3ae5d743f36..11e0995c94e 100644 --- a/soh/soh/resource/type/Skeleton.h +++ b/soh/soh/resource/type/Skeleton.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include "SkeletonLimb.h" #include diff --git a/soh/soh/resource/type/Text.h b/soh/soh/resource/type/Text.h index ff921e7317b..a9f00ef2770 100644 --- a/soh/soh/resource/type/Text.h +++ b/soh/soh/resource/type/Text.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include #include diff --git a/soh/soh/resource/type/scenecommand/EndMarker.h b/soh/soh/resource/type/scenecommand/EndMarker.h index 5d3a0f7dfb7..17b3b4fff14 100644 --- a/soh/soh/resource/type/scenecommand/EndMarker.h +++ b/soh/soh/resource/type/scenecommand/EndMarker.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include #include diff --git a/soh/soh/resource/type/scenecommand/RomFile.h b/soh/soh/resource/type/scenecommand/RomFile.h index 5262ce6499e..78bad901ff2 100644 --- a/soh/soh/resource/type/scenecommand/RomFile.h +++ b/soh/soh/resource/type/scenecommand/RomFile.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace SOH { typedef struct { diff --git a/soh/soh/resource/type/scenecommand/SceneCommand.h b/soh/soh/resource/type/scenecommand/SceneCommand.h index 1e71599dc19..8d684e1465d 100644 --- a/soh/soh/resource/type/scenecommand/SceneCommand.h +++ b/soh/soh/resource/type/scenecommand/SceneCommand.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include #include diff --git a/soh/soh/resource/type/scenecommand/SetActorList.h b/soh/soh/resource/type/scenecommand/SetActorList.h index b444aadd0b8..63d218a2481 100644 --- a/soh/soh/resource/type/scenecommand/SetActorList.h +++ b/soh/soh/resource/type/scenecommand/SetActorList.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include #include diff --git a/soh/soh/resource/type/scenecommand/SetAlternateHeaders.h b/soh/soh/resource/type/scenecommand/SetAlternateHeaders.h index 38817d1a6c2..2d6118fe0c4 100644 --- a/soh/soh/resource/type/scenecommand/SetAlternateHeaders.h +++ b/soh/soh/resource/type/scenecommand/SetAlternateHeaders.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include #include diff --git a/soh/soh/resource/type/scenecommand/SetCameraSettings.h b/soh/soh/resource/type/scenecommand/SetCameraSettings.h index 0cc03cfd56c..62bee9aaa8a 100644 --- a/soh/soh/resource/type/scenecommand/SetCameraSettings.h +++ b/soh/soh/resource/type/scenecommand/SetCameraSettings.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include #include diff --git a/soh/soh/resource/type/scenecommand/SetCollisionHeader.h b/soh/soh/resource/type/scenecommand/SetCollisionHeader.h index 283a8bc0a2f..17940cb133a 100644 --- a/soh/soh/resource/type/scenecommand/SetCollisionHeader.h +++ b/soh/soh/resource/type/scenecommand/SetCollisionHeader.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include #include diff --git a/soh/soh/resource/type/scenecommand/SetCsCamera.h b/soh/soh/resource/type/scenecommand/SetCsCamera.h index 42db0775440..7af48b990c7 100644 --- a/soh/soh/resource/type/scenecommand/SetCsCamera.h +++ b/soh/soh/resource/type/scenecommand/SetCsCamera.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include #include diff --git a/soh/soh/resource/type/scenecommand/SetCutscenes.h b/soh/soh/resource/type/scenecommand/SetCutscenes.h index 0988b2027bd..d24dddbb0ca 100644 --- a/soh/soh/resource/type/scenecommand/SetCutscenes.h +++ b/soh/soh/resource/type/scenecommand/SetCutscenes.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include #include diff --git a/soh/soh/resource/type/scenecommand/SetEchoSettings.h b/soh/soh/resource/type/scenecommand/SetEchoSettings.h index dfa0538a485..bfdbecf58e4 100644 --- a/soh/soh/resource/type/scenecommand/SetEchoSettings.h +++ b/soh/soh/resource/type/scenecommand/SetEchoSettings.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include #include diff --git a/soh/soh/resource/type/scenecommand/SetEntranceList.h b/soh/soh/resource/type/scenecommand/SetEntranceList.h index 08fcf9fca0b..d9fad36fb4b 100644 --- a/soh/soh/resource/type/scenecommand/SetEntranceList.h +++ b/soh/soh/resource/type/scenecommand/SetEntranceList.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include #include diff --git a/soh/soh/resource/type/scenecommand/SetExitList.h b/soh/soh/resource/type/scenecommand/SetExitList.h index d9598c3cd67..958f62f7bc2 100644 --- a/soh/soh/resource/type/scenecommand/SetExitList.h +++ b/soh/soh/resource/type/scenecommand/SetExitList.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include #include diff --git a/soh/soh/resource/type/scenecommand/SetLightList.h b/soh/soh/resource/type/scenecommand/SetLightList.h index 3a95a4f8fdb..a9c48914b15 100644 --- a/soh/soh/resource/type/scenecommand/SetLightList.h +++ b/soh/soh/resource/type/scenecommand/SetLightList.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include #include diff --git a/soh/soh/resource/type/scenecommand/SetLightingSettings.h b/soh/soh/resource/type/scenecommand/SetLightingSettings.h index ca9282225e0..6eadad1e7ca 100644 --- a/soh/soh/resource/type/scenecommand/SetLightingSettings.h +++ b/soh/soh/resource/type/scenecommand/SetLightingSettings.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include #include diff --git a/soh/soh/resource/type/scenecommand/SetMesh.h b/soh/soh/resource/type/scenecommand/SetMesh.h index 1ab86530a96..baf7744f27c 100644 --- a/soh/soh/resource/type/scenecommand/SetMesh.h +++ b/soh/soh/resource/type/scenecommand/SetMesh.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include #include diff --git a/soh/soh/resource/type/scenecommand/SetObjectList.h b/soh/soh/resource/type/scenecommand/SetObjectList.h index 5650f6d947c..49fc5079da2 100644 --- a/soh/soh/resource/type/scenecommand/SetObjectList.h +++ b/soh/soh/resource/type/scenecommand/SetObjectList.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include #include diff --git a/soh/soh/resource/type/scenecommand/SetPathways.h b/soh/soh/resource/type/scenecommand/SetPathways.h index ec201136708..6862049bbcb 100644 --- a/soh/soh/resource/type/scenecommand/SetPathways.h +++ b/soh/soh/resource/type/scenecommand/SetPathways.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include #include diff --git a/soh/soh/resource/type/scenecommand/SetRoomBehavior.h b/soh/soh/resource/type/scenecommand/SetRoomBehavior.h index 8a1c2b832ae..8114a4b6254 100644 --- a/soh/soh/resource/type/scenecommand/SetRoomBehavior.h +++ b/soh/soh/resource/type/scenecommand/SetRoomBehavior.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include #include diff --git a/soh/soh/resource/type/scenecommand/SetRoomList.h b/soh/soh/resource/type/scenecommand/SetRoomList.h index 6fe6d33ff3f..f8530a1a772 100644 --- a/soh/soh/resource/type/scenecommand/SetRoomList.h +++ b/soh/soh/resource/type/scenecommand/SetRoomList.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include #include diff --git a/soh/soh/resource/type/scenecommand/SetSkyboxModifier.h b/soh/soh/resource/type/scenecommand/SetSkyboxModifier.h index 189e4ab3d77..003b8411e24 100644 --- a/soh/soh/resource/type/scenecommand/SetSkyboxModifier.h +++ b/soh/soh/resource/type/scenecommand/SetSkyboxModifier.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include #include diff --git a/soh/soh/resource/type/scenecommand/SetSkyboxSettings.h b/soh/soh/resource/type/scenecommand/SetSkyboxSettings.h index cf3bbfbad00..d5bdc97c374 100644 --- a/soh/soh/resource/type/scenecommand/SetSkyboxSettings.h +++ b/soh/soh/resource/type/scenecommand/SetSkyboxSettings.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include #include diff --git a/soh/soh/resource/type/scenecommand/SetSoundSettings.h b/soh/soh/resource/type/scenecommand/SetSoundSettings.h index ba180d82325..184063afd37 100644 --- a/soh/soh/resource/type/scenecommand/SetSoundSettings.h +++ b/soh/soh/resource/type/scenecommand/SetSoundSettings.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include #include diff --git a/soh/soh/resource/type/scenecommand/SetSpecialObjects.h b/soh/soh/resource/type/scenecommand/SetSpecialObjects.h index 1e9e44e9f06..d2c0b93606c 100644 --- a/soh/soh/resource/type/scenecommand/SetSpecialObjects.h +++ b/soh/soh/resource/type/scenecommand/SetSpecialObjects.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include #include diff --git a/soh/soh/resource/type/scenecommand/SetStartPositionList.h b/soh/soh/resource/type/scenecommand/SetStartPositionList.h index 2b1ddce893f..64b4b89b78b 100644 --- a/soh/soh/resource/type/scenecommand/SetStartPositionList.h +++ b/soh/soh/resource/type/scenecommand/SetStartPositionList.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include #include diff --git a/soh/soh/resource/type/scenecommand/SetTimeSettings.h b/soh/soh/resource/type/scenecommand/SetTimeSettings.h index c5b63283ba4..76eda7439a8 100644 --- a/soh/soh/resource/type/scenecommand/SetTimeSettings.h +++ b/soh/soh/resource/type/scenecommand/SetTimeSettings.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include #include diff --git a/soh/soh/resource/type/scenecommand/SetTransitionActorList.h b/soh/soh/resource/type/scenecommand/SetTransitionActorList.h index 0b7149fa64b..6b395d97931 100644 --- a/soh/soh/resource/type/scenecommand/SetTransitionActorList.h +++ b/soh/soh/resource/type/scenecommand/SetTransitionActorList.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include #include diff --git a/soh/soh/resource/type/scenecommand/SetWindSettings.h b/soh/soh/resource/type/scenecommand/SetWindSettings.h index 87e0a3039a6..f712488d30c 100644 --- a/soh/soh/resource/type/scenecommand/SetWindSettings.h +++ b/soh/soh/resource/type/scenecommand/SetWindSettings.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include #include