Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion soh/soh/Enhancements/audio/AudioCollection.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include <map>
#include <string>
#include <set>
#include <cstdint>
#include <stdint.h>

enum SeqType {
SEQ_NOSHUFFLE = 0,
Expand Down
2 changes: 1 addition & 1 deletion soh/soh/Enhancements/audio/AudioEditor.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#pragma once
#include "stdint.h"
#include <stdint.h>

#ifdef __cplusplus

Expand Down
2 changes: 1 addition & 1 deletion soh/soh/Enhancements/controls/SohInputEditorWindow.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "stdint.h"
#include <stdint.h>
#include <libultraship/libultraship.h>
#include <imgui.h>
#include <unordered_map>
Expand Down
2 changes: 1 addition & 1 deletion soh/soh/Enhancements/custom-message/CustomMessageManager.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once
#include <unordered_map>
#include <cstdint>
#include <stdint.h>
#include <exception>
#include <vector>
#include <string>
Expand Down
2 changes: 1 addition & 1 deletion soh/soh/Enhancements/debugconsole.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#pragma once

#include "stdint.h"
#include <stdint.h>

void DebugConsole_Init(void);
2 changes: 1 addition & 1 deletion soh/soh/Enhancements/debugger/debugSaveEditor.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include <map>
#include <string>
#include <vector>
#include <cstdint>
#include <stdint.h>
#include "soh/Enhancements/randomizer/randomizerTypes.h"
#include <libultraship/libultraship.h>

Expand Down
2 changes: 1 addition & 1 deletion soh/soh/Enhancements/randomizer/3drando/random.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include "soh/ShipUtils.h"
#include <array>
#include <cstddef>
#include <cstdint>
#include <stdint.h>
#include <utility>
#include <vector>
#include <set>
Expand Down
2 changes: 1 addition & 1 deletion soh/soh/Enhancements/randomizer/logic.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#include "randomizerTypes.h"
#include "SeedContext.h"
#include <cstdint>
#include <stdint.h>

namespace Rando {

Expand Down
2 changes: 1 addition & 1 deletion soh/soh/Enhancements/randomizer/option.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#ifndef RANDOPTION_H
#define RANDOPTION_H

#include <cstdint>
#include <stdint.h>
#include <set>
#include <string>
#include <unordered_map>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#include <string>
#include <vector>
#include <cstdint>
#include <stdint.h>

#include <libultraship/libultraship.h>
#include "randomizerTypes.h"
Expand Down
2 changes: 1 addition & 1 deletion soh/soh/Enhancements/randomizer/randomizer_item_tracker.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#include <string>
#include <vector>
#include <cstdint>
#include <stdint.h>
#include <libultraship/libultraship.h>

void DrawItemAmmo(int itemId);
Expand Down
2 changes: 1 addition & 1 deletion soh/soh/Enhancements/savestates.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#ifndef SAVE_STATES_H
#define SAVE_STATES_H

#include <cstdint>
#include <stdint.h>
#include <queue>
#include <unordered_map>
#include <memory>
Expand Down
3 changes: 2 additions & 1 deletion soh/soh/OTRGlobals.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
#define M_PI_2f 1.57079632679489661923f // pi/2

#ifdef __cplusplus
#include <memory> // for shared_ptr
#include <stdint.h>
#include <memory>
#include <string>
#include <unordered_map>

Expand Down
2 changes: 1 addition & 1 deletion soh/soh/resource/type/AudioSample.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include <cstdint>
#include <stdint.h>
#include <ship/resource/Resource.h>
#include <libultraship/libultra/types.h>

Expand Down
2 changes: 1 addition & 1 deletion soh/soh/resource/type/AudioSequence.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include <cstdint>
#include <stdint.h>
#include <ship/resource/Resource.h>

namespace SOH {
Expand Down
2 changes: 1 addition & 1 deletion soh/soh/resource/type/AudioSoundFont.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include <cstdint>
#include <stdint.h>
#include <vector>
#include <ship/resource/Resource.h>
#include "soh/resource/type/AudioSample.h"
Expand Down
2 changes: 1 addition & 1 deletion soh/soh/resource/type/CollisionHeader.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include <cstdint>
#include <stdint.h>
#include <vector>
#include <ship/resource/Resource.h>
#include <libultraship/libultra.h>
Expand Down
2 changes: 1 addition & 1 deletion soh/soh/resource/type/Path.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include <cstdint>
#include <stdint.h>
#include <vector>
#include <ship/resource/Resource.h>
#include <libultraship/libultra/types.h>
Expand Down
2 changes: 1 addition & 1 deletion soh/soh/resource/type/Scene.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include <cstdint>
#include <stdint.h>
#include <vector>
#include <memory>
#include <ship/resource/Resource.h>
Expand Down
2 changes: 1 addition & 1 deletion soh/soh/resource/type/Skeleton.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include <cstdint>
#include <stdint.h>
#include <ship/resource/Resource.h>
#include "SkeletonLimb.h"
#include <z64animation.h>
Expand Down
2 changes: 1 addition & 1 deletion soh/soh/resource/type/Text.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include <cstdint>
#include <stdint.h>
#include <vector>
#include <ship/resource/Resource.h>
#include <libultraship/libultra/types.h>
Expand Down
2 changes: 1 addition & 1 deletion soh/soh/resource/type/scenecommand/EndMarker.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include <cstdint>
#include <stdint.h>
#include <vector>
#include <memory>
#include <ship/resource/Resource.h>
Expand Down
2 changes: 1 addition & 1 deletion soh/soh/resource/type/scenecommand/RomFile.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include <cstdint>
#include <stdint.h>

namespace SOH {
typedef struct {
Expand Down
2 changes: 1 addition & 1 deletion soh/soh/resource/type/scenecommand/SceneCommand.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include <cstdint>
#include <stdint.h>
#include <vector>
#include <memory>
#include <ship/resource/Resource.h>
Expand Down
2 changes: 1 addition & 1 deletion soh/soh/resource/type/scenecommand/SetActorList.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include <cstdint>
#include <stdint.h>
#include <vector>
#include <memory>
#include <string>
Expand Down
2 changes: 1 addition & 1 deletion soh/soh/resource/type/scenecommand/SetAlternateHeaders.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include <cstdint>
#include <stdint.h>
#include <vector>
#include <memory>
#include <string>
Expand Down
2 changes: 1 addition & 1 deletion soh/soh/resource/type/scenecommand/SetCameraSettings.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include <cstdint>
#include <stdint.h>
#include <vector>
#include <memory>
#include <ship/resource/Resource.h>
Expand Down
2 changes: 1 addition & 1 deletion soh/soh/resource/type/scenecommand/SetCollisionHeader.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include <cstdint>
#include <stdint.h>
#include <vector>
#include <memory>
#include <string>
Expand Down
2 changes: 1 addition & 1 deletion soh/soh/resource/type/scenecommand/SetCsCamera.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include <cstdint>
#include <stdint.h>
#include <vector>
#include <memory>
#include <ship/resource/Resource.h>
Expand Down
2 changes: 1 addition & 1 deletion soh/soh/resource/type/scenecommand/SetCutscenes.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include <cstdint>
#include <stdint.h>
#include <vector>
#include <memory>
#include <string>
Expand Down
2 changes: 1 addition & 1 deletion soh/soh/resource/type/scenecommand/SetEchoSettings.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include <cstdint>
#include <stdint.h>
#include <vector>
#include <memory>
#include <ship/resource/Resource.h>
Expand Down
2 changes: 1 addition & 1 deletion soh/soh/resource/type/scenecommand/SetEntranceList.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include <cstdint>
#include <stdint.h>
#include <vector>
#include <memory>
#include <string>
Expand Down
2 changes: 1 addition & 1 deletion soh/soh/resource/type/scenecommand/SetExitList.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include <cstdint>
#include <stdint.h>
#include <vector>
#include <memory>
#include <ship/resource/Resource.h>
Expand Down
2 changes: 1 addition & 1 deletion soh/soh/resource/type/scenecommand/SetLightList.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include <cstdint>
#include <stdint.h>
#include <vector>
#include <memory>
#include <string>
Expand Down
2 changes: 1 addition & 1 deletion soh/soh/resource/type/scenecommand/SetLightingSettings.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include <cstdint>
#include <stdint.h>
#include <vector>
#include <memory>
#include <ship/resource/Resource.h>
Expand Down
2 changes: 1 addition & 1 deletion soh/soh/resource/type/scenecommand/SetMesh.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include <cstdint>
#include <stdint.h>
#include <vector>
#include <memory>
#include <ship/resource/Resource.h>
Expand Down
2 changes: 1 addition & 1 deletion soh/soh/resource/type/scenecommand/SetObjectList.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include <cstdint>
#include <stdint.h>
#include <vector>
#include <memory>
#include <string>
Expand Down
2 changes: 1 addition & 1 deletion soh/soh/resource/type/scenecommand/SetPathways.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include <cstdint>
#include <stdint.h>
#include <vector>
#include <memory>
#include <ship/resource/Resource.h>
Expand Down
2 changes: 1 addition & 1 deletion soh/soh/resource/type/scenecommand/SetRoomBehavior.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include <cstdint>
#include <stdint.h>
#include <vector>
#include <memory>
#include <ship/resource/Resource.h>
Expand Down
2 changes: 1 addition & 1 deletion soh/soh/resource/type/scenecommand/SetRoomList.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include <cstdint>
#include <stdint.h>
#include <vector>
#include <memory>
#include <string>
Expand Down
2 changes: 1 addition & 1 deletion soh/soh/resource/type/scenecommand/SetSkyboxModifier.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include <cstdint>
#include <stdint.h>
#include <vector>
#include <memory>
#include <ship/resource/Resource.h>
Expand Down
2 changes: 1 addition & 1 deletion soh/soh/resource/type/scenecommand/SetSkyboxSettings.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include <cstdint>
#include <stdint.h>
#include <vector>
#include <memory>
#include <ship/resource/Resource.h>
Expand Down
2 changes: 1 addition & 1 deletion soh/soh/resource/type/scenecommand/SetSoundSettings.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include <cstdint>
#include <stdint.h>
#include <vector>
#include <memory>
#include <ship/resource/Resource.h>
Expand Down
2 changes: 1 addition & 1 deletion soh/soh/resource/type/scenecommand/SetSpecialObjects.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include <cstdint>
#include <stdint.h>
#include <vector>
#include <memory>
#include <ship/resource/Resource.h>
Expand Down
2 changes: 1 addition & 1 deletion soh/soh/resource/type/scenecommand/SetStartPositionList.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include <cstdint>
#include <stdint.h>
#include <vector>
#include <memory>
#include <string>
Expand Down
2 changes: 1 addition & 1 deletion soh/soh/resource/type/scenecommand/SetTimeSettings.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include <cstdint>
#include <stdint.h>
#include <vector>
#include <memory>
#include <ship/resource/Resource.h>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include <cstdint>
#include <stdint.h>
#include <vector>
#include <memory>
#include <string>
Expand Down
2 changes: 1 addition & 1 deletion soh/soh/resource/type/scenecommand/SetWindSettings.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include <cstdint>
#include <stdint.h>
#include <vector>
#include <memory>
#include <ship/resource/Resource.h>
Expand Down
Loading