From 0ead6056e66287f515a3bb0f9117ad93bc32d543 Mon Sep 17 00:00:00 2001 From: briaguya <70942617+briaguya-ai@users.noreply.github.com> Date: Fri, 9 Feb 2024 14:25:55 -0500 Subject: [PATCH] stop putting things in the LUS namespace from SoH --- soh/soh/resource/type/Animation.cpp | 2 - soh/soh/resource/type/AudioSample.cpp | 2 - soh/soh/resource/type/AudioSample.h | 98 +++++++++---------- soh/soh/resource/type/AudioSequence.cpp | 3 - soh/soh/resource/type/AudioSequence.h | 7 +- soh/soh/resource/type/AudioSoundFont.cpp | 2 - soh/soh/resource/type/AudioSoundFont.h | 7 +- soh/soh/resource/type/Background.cpp | 2 - soh/soh/resource/type/Background.h | 6 +- soh/soh/resource/type/CollisionHeader.cpp | 2 - soh/soh/resource/type/CollisionHeader.h | 7 +- soh/soh/resource/type/Cutscene.cpp | 2 - soh/soh/resource/type/Cutscene.h | 18 +--- soh/soh/resource/type/Path.cpp | 2 - soh/soh/resource/type/Path.h | 7 +- soh/soh/resource/type/Scene.cpp | 2 - soh/soh/resource/type/Scene.h | 7 +- soh/soh/resource/type/Skeleton.cpp | 2 - soh/soh/resource/type/Skeleton.h | 9 +- soh/soh/resource/type/SkeletonLimb.cpp | 2 - soh/soh/resource/type/SkeletonLimb.h | 6 +- soh/soh/resource/type/Text.cpp | 2 - soh/soh/resource/type/Text.h | 6 +- .../resource/type/scenecommand/EndMarker.cpp | 2 - .../resource/type/scenecommand/EndMarker.h | 2 - soh/soh/resource/type/scenecommand/RomFile.h | 12 +-- .../resource/type/scenecommand/SceneCommand.h | 8 +- .../type/scenecommand/SetActorList.cpp | 2 - .../resource/type/scenecommand/SetActorList.h | 2 - .../type/scenecommand/SetAlternateHeaders.cpp | 2 - .../type/scenecommand/SetAlternateHeaders.h | 4 - .../type/scenecommand/SetCameraSettings.cpp | 2 - .../type/scenecommand/SetCameraSettings.h | 2 - .../type/scenecommand/SetCollisionHeader.cpp | 2 - .../type/scenecommand/SetCollisionHeader.h | 2 - .../type/scenecommand/SetCsCamera.cpp | 2 - .../resource/type/scenecommand/SetCsCamera.h | 2 - .../type/scenecommand/SetCutscenes.cpp | 2 - .../resource/type/scenecommand/SetCutscenes.h | 2 - .../type/scenecommand/SetEchoSettings.cpp | 2 - .../type/scenecommand/SetEchoSettings.h | 2 - .../type/scenecommand/SetEntranceList.cpp | 2 - .../type/scenecommand/SetEntranceList.h | 2 - .../type/scenecommand/SetExitList.cpp | 2 - .../resource/type/scenecommand/SetExitList.h | 2 - .../type/scenecommand/SetLightList.cpp | 2 - .../resource/type/scenecommand/SetLightList.h | 2 - .../type/scenecommand/SetLightingSettings.cpp | 2 - .../type/scenecommand/SetLightingSettings.h | 2 - .../resource/type/scenecommand/SetMesh.cpp | 2 - soh/soh/resource/type/scenecommand/SetMesh.h | 2 - .../type/scenecommand/SetObjectList.cpp | 2 - .../type/scenecommand/SetObjectList.h | 2 - .../type/scenecommand/SetPathways.cpp | 2 - .../resource/type/scenecommand/SetPathways.h | 3 - .../type/scenecommand/SetRoomBehavior.cpp | 2 - .../type/scenecommand/SetRoomBehavior.h | 2 - .../type/scenecommand/SetRoomList.cpp | 2 - .../resource/type/scenecommand/SetRoomList.h | 9 -- .../type/scenecommand/SetSkyboxModifier.cpp | 2 - .../type/scenecommand/SetSkyboxModifier.h | 2 - .../type/scenecommand/SetSkyboxSettings.cpp | 2 - .../type/scenecommand/SetSkyboxSettings.h | 2 - .../type/scenecommand/SetSoundSettings.cpp | 2 - .../type/scenecommand/SetSoundSettings.h | 2 - .../type/scenecommand/SetSpecialObjects.cpp | 2 - .../type/scenecommand/SetSpecialObjects.h | 2 - .../scenecommand/SetStartPositionList.cpp | 2 - .../type/scenecommand/SetStartPositionList.h | 9 -- .../type/scenecommand/SetTimeSettings.cpp | 2 - .../type/scenecommand/SetTimeSettings.h | 2 - .../scenecommand/SetTransitionActorList.cpp | 2 - .../scenecommand/SetTransitionActorList.h | 2 - .../type/scenecommand/SetWindSettings.cpp | 2 - .../type/scenecommand/SetWindSettings.h | 2 - 75 files changed, 75 insertions(+), 265 deletions(-) diff --git a/soh/soh/resource/type/Animation.cpp b/soh/soh/resource/type/Animation.cpp index 46327c732..7ae782259 100644 --- a/soh/soh/resource/type/Animation.cpp +++ b/soh/soh/resource/type/Animation.cpp @@ -1,6 +1,5 @@ #include "Animation.h" -namespace LUS { AnimationData* Animation::GetPointer() { return &animationData; } @@ -18,4 +17,3 @@ size_t Animation::GetPointerSize() { return 0; } } -} // namespace LUS \ No newline at end of file diff --git a/soh/soh/resource/type/AudioSample.cpp b/soh/soh/resource/type/AudioSample.cpp index 951aae6c1..a03d46634 100644 --- a/soh/soh/resource/type/AudioSample.cpp +++ b/soh/soh/resource/type/AudioSample.cpp @@ -1,6 +1,5 @@ #include "AudioSample.h" -namespace LUS { Sample* AudioSample::GetPointer() { return &sample; } @@ -8,4 +7,3 @@ Sample* AudioSample::GetPointer() { size_t AudioSample::GetPointerSize() { return sizeof(Sample); } -} // namespace LUS \ No newline at end of file diff --git a/soh/soh/resource/type/AudioSample.h b/soh/soh/resource/type/AudioSample.h index eda8aa456..4bf76078e 100644 --- a/soh/soh/resource/type/AudioSample.h +++ b/soh/soh/resource/type/AudioSample.h @@ -5,57 +5,55 @@ #include "Resource.h" #include -namespace LUS { - typedef struct { - /* 0x00 */ uintptr_t start; - /* 0x04 */ uintptr_t end; - /* 0x08 */ u32 count; - /* 0x0C */ char unk_0C[0x4]; - /* 0x10 */ s16 state[16]; // only exists if count != 0. 8-byte aligned - } AdpcmLoop; // size = 0x30 (or 0x10) +typedef struct { + /* 0x00 */ uintptr_t start; + /* 0x04 */ uintptr_t end; + /* 0x08 */ u32 count; + /* 0x0C */ char unk_0C[0x4]; + /* 0x10 */ s16 state[16]; // only exists if count != 0. 8-byte aligned +} AdpcmLoop; // size = 0x30 (or 0x10) - typedef struct { - /* 0x00 */ s32 order; - /* 0x04 */ s32 npredictors; - /* 0x08 */ s16* book; // size 8 * order * npredictors. 8-byte aligned - } AdpcmBook; // s +typedef struct { + /* 0x00 */ s32 order; + /* 0x04 */ s32 npredictors; + /* 0x08 */ s16* book; // size 8 * order * npredictors. 8-byte aligned +} AdpcmBook; // s - typedef struct { - union { - struct { - /* 0x00 */ u32 codec : 4; - /* 0x00 */ u32 medium : 2; - /* 0x00 */ u32 unk_bit26 : 1; - /* 0x00 */ u32 unk_bit25 : 1; // this has been named isRelocated in zret - /* 0x01 */ u32 size : 24; - }; - u32 asU32; +typedef struct { + union { + struct { + /* 0x00 */ u32 codec : 4; + /* 0x00 */ u32 medium : 2; + /* 0x00 */ u32 unk_bit26 : 1; + /* 0x00 */ u32 unk_bit25 : 1; // this has been named isRelocated in zret + /* 0x01 */ u32 size : 24; }; - - /* 0x04 */ u8* sampleAddr; - /* 0x08 */ AdpcmLoop* loop; - /* 0x0C */ AdpcmBook* book; - u32 sampleRateMagicValue; // For wav samples only... - s32 sampleRate; // For wav samples only... - } Sample; // size = 0x10 - - class AudioSample : public Resource { - public: - using Resource::Resource; - - AudioSample() : Resource(std::shared_ptr()) {} - - Sample* GetPointer(); - size_t GetPointerSize(); - - Sample sample; - std::vector audioSampleData; - - AdpcmLoop loop; - uint32_t loopStateCount; - - AdpcmBook book; - uint32_t bookDataCount; - std::vector bookData; + u32 asU32; }; -}; // namespace LUS + + /* 0x04 */ u8* sampleAddr; + /* 0x08 */ AdpcmLoop* loop; + /* 0x0C */ AdpcmBook* book; + u32 sampleRateMagicValue; // For wav samples only... + s32 sampleRate; // For wav samples only... +} Sample; // size = 0x10 + +class AudioSample : public LUS::Resource { + public: + using Resource::Resource; + + AudioSample() : Resource(std::shared_ptr()) {} + + Sample* GetPointer(); + size_t GetPointerSize(); + + Sample sample; + std::vector audioSampleData; + + AdpcmLoop loop; + uint32_t loopStateCount; + + AdpcmBook book; + uint32_t bookDataCount; + std::vector bookData; +}; diff --git a/soh/soh/resource/type/AudioSequence.cpp b/soh/soh/resource/type/AudioSequence.cpp index c09514a67..f2cd49aad 100644 --- a/soh/soh/resource/type/AudioSequence.cpp +++ b/soh/soh/resource/type/AudioSequence.cpp @@ -1,7 +1,5 @@ #include "AudioSequence.h" -namespace LUS { - Sequence* AudioSequence::GetPointer() { return &sequence; } @@ -9,4 +7,3 @@ Sequence* AudioSequence::GetPointer() { size_t AudioSequence::GetPointerSize() { return sizeof(Sequence); } -} // namespace LUS diff --git a/soh/soh/resource/type/AudioSequence.h b/soh/soh/resource/type/AudioSequence.h index 2b2bb8be9..5c9c5efe9 100644 --- a/soh/soh/resource/type/AudioSequence.h +++ b/soh/soh/resource/type/AudioSequence.h @@ -5,8 +5,6 @@ #include "Resource.h" #include -namespace LUS { - typedef struct { char* seqData; int32_t seqDataSize; @@ -17,11 +15,11 @@ typedef struct { uint8_t fonts[16]; } Sequence; -class AudioSequence : public Resource { +class AudioSequence : public LUS::Resource { public: using Resource::Resource; - AudioSequence() : Resource(std::shared_ptr()) {} + AudioSequence() : Resource(std::shared_ptr()) {} Sequence* GetPointer(); size_t GetPointerSize(); @@ -29,4 +27,3 @@ public: Sequence sequence; std::vector sequenceData; }; -}; // namespace LUS diff --git a/soh/soh/resource/type/AudioSoundFont.cpp b/soh/soh/resource/type/AudioSoundFont.cpp index 43ac40abf..152039881 100644 --- a/soh/soh/resource/type/AudioSoundFont.cpp +++ b/soh/soh/resource/type/AudioSoundFont.cpp @@ -1,6 +1,5 @@ #include "AudioSoundFont.h" -namespace LUS { SoundFont* AudioSoundFont::GetPointer() { return &soundFont; } @@ -8,4 +7,3 @@ SoundFont* AudioSoundFont::GetPointer() { size_t AudioSoundFont::GetPointerSize() { return sizeof(SoundFont); } -} // namespace LUS diff --git a/soh/soh/resource/type/AudioSoundFont.h b/soh/soh/resource/type/AudioSoundFont.h index c47218090..692f39dc3 100644 --- a/soh/soh/resource/type/AudioSoundFont.h +++ b/soh/soh/resource/type/AudioSoundFont.h @@ -6,8 +6,6 @@ #include "soh/resource/type/AudioSample.h" #include -namespace LUS { - typedef struct { /* 0x0 */ s16 delay; /* 0x2 */ s16 arg; @@ -52,11 +50,11 @@ typedef struct { s32 fntIndex; } SoundFont; // size = 0x14 -class AudioSoundFont : public Resource { +class AudioSoundFont : public LUS::Resource { public: using Resource::Resource; - AudioSoundFont() : Resource(std::shared_ptr()) {} + AudioSoundFont() : Resource(std::shared_ptr()) {} SoundFont* GetPointer(); size_t GetPointerSize(); @@ -81,4 +79,3 @@ public: SoundFont soundFont; }; -}; // namespace LUS diff --git a/soh/soh/resource/type/Background.cpp b/soh/soh/resource/type/Background.cpp index bc1047b5c..252b50285 100644 --- a/soh/soh/resource/type/Background.cpp +++ b/soh/soh/resource/type/Background.cpp @@ -1,6 +1,5 @@ #include "Background.h" -namespace LUS { uint8_t* Background::GetPointer() { return Data.data(); } @@ -8,4 +7,3 @@ uint8_t* Background::GetPointer() { size_t Background::GetPointerSize() { return Data.size() * sizeof(uint8_t); } -} // namespace LUS diff --git a/soh/soh/resource/type/Background.h b/soh/soh/resource/type/Background.h index 7f22658e0..a835470a5 100644 --- a/soh/soh/resource/type/Background.h +++ b/soh/soh/resource/type/Background.h @@ -2,16 +2,14 @@ #include "resource/Resource.h" -namespace LUS { -class Background : public Resource { +class Background : public LUS::Resource { public: using Resource::Resource; - Background() : Resource(std::shared_ptr()) {} + Background() : Resource(std::shared_ptr()) {} uint8_t* GetPointer(); size_t GetPointerSize(); std::vector Data; }; -}; // namespace LUS diff --git a/soh/soh/resource/type/CollisionHeader.cpp b/soh/soh/resource/type/CollisionHeader.cpp index 5625d2b59..b4cdf76d4 100644 --- a/soh/soh/resource/type/CollisionHeader.cpp +++ b/soh/soh/resource/type/CollisionHeader.cpp @@ -1,6 +1,5 @@ #include "CollisionHeader.h" -namespace LUS { CollisionHeaderData* CollisionHeader::GetPointer() { return &collisionHeaderData; } @@ -8,4 +7,3 @@ CollisionHeaderData* CollisionHeader::GetPointer() { size_t CollisionHeader::GetPointerSize() { return sizeof(collisionHeaderData); } -} // namespace LUS \ No newline at end of file diff --git a/soh/soh/resource/type/CollisionHeader.h b/soh/soh/resource/type/CollisionHeader.h index e401aa7f5..6f0416350 100644 --- a/soh/soh/resource/type/CollisionHeader.h +++ b/soh/soh/resource/type/CollisionHeader.h @@ -6,8 +6,6 @@ #include #include "z64math.h" -namespace LUS { - typedef struct { /* 0x00 */ u16 type; union { @@ -67,11 +65,11 @@ typedef struct { size_t cameraDataListLen; // OTRTODO: Added to allow for bounds checking the cameraDataList. } CollisionHeaderData; // original name: BGDataInfo -class CollisionHeader : public Resource { +class CollisionHeader : public LUS::Resource { public: using Resource::Resource; - CollisionHeader() : Resource(std::shared_ptr()) {} + CollisionHeader() : Resource(std::shared_ptr()) {} CollisionHeaderData* GetPointer(); size_t GetPointerSize(); @@ -95,4 +93,3 @@ public: std::vector waterBoxes; }; -}; // namespace LUS diff --git a/soh/soh/resource/type/Cutscene.cpp b/soh/soh/resource/type/Cutscene.cpp index c7e98062a..c2b60a665 100644 --- a/soh/soh/resource/type/Cutscene.cpp +++ b/soh/soh/resource/type/Cutscene.cpp @@ -1,7 +1,6 @@ #include "Cutscene.h" #include -namespace LUS { uint32_t* Cutscene::GetPointer() { return commands.data(); } @@ -9,4 +8,3 @@ uint32_t* Cutscene::GetPointer() { size_t Cutscene::GetPointerSize() { return commands.size() * sizeof(uint32_t); } -} // namespace LUS \ No newline at end of file diff --git a/soh/soh/resource/type/Cutscene.h b/soh/soh/resource/type/Cutscene.h index 5bd268e61..0366bb644 100644 --- a/soh/soh/resource/type/Cutscene.h +++ b/soh/soh/resource/type/Cutscene.h @@ -7,8 +7,6 @@ #include "Vec3f.h" #include "Color3b.h" -namespace LUS { - enum class CutsceneCommands { Cmd00 = 0x0000, SetCameraPos = 0x0001, @@ -44,11 +42,11 @@ enum class CutsceneCommands { Error = 0xFEAF, }; -class Cutscene : public Resource { +class Cutscene : public LUS::Resource { public: using Resource::Resource; - Cutscene() : Resource(std::shared_ptr()) {} + Cutscene() : Resource(std::shared_ptr()) {} uint32_t* GetPointer(); size_t GetPointerSize(); @@ -57,15 +55,3 @@ class Cutscene : public Resource { uint32_t endFrame; std::vector commands; }; -} // namespace LUS - - -///////////// - -// class CutsceneCommand { -// public: -// uint32_t commandID; -// uint32_t commandIndex; - -// CutsceneCommand(){}; -// }; diff --git a/soh/soh/resource/type/Path.cpp b/soh/soh/resource/type/Path.cpp index 535db4e7d..50d5f72be 100644 --- a/soh/soh/resource/type/Path.cpp +++ b/soh/soh/resource/type/Path.cpp @@ -1,6 +1,5 @@ #include "Path.h" -namespace LUS { PathData* Path::GetPointer() { return pathData.data(); } @@ -8,4 +7,3 @@ PathData* Path::GetPointer() { size_t Path::GetPointerSize() { return pathData.size() * sizeof(PathData); } -} // namespace LUS diff --git a/soh/soh/resource/type/Path.h b/soh/soh/resource/type/Path.h index 5dd16dec9..d73c298ad 100644 --- a/soh/soh/resource/type/Path.h +++ b/soh/soh/resource/type/Path.h @@ -6,18 +6,16 @@ #include #include "z64math.h" -namespace LUS { - typedef struct { /* 0x00 */ u8 count; // number of points in the path /* 0x04 */ Vec3s* points; // Segment Address to the array of points } PathData; // size = 0x8 -class Path : public Resource { +class Path : public LUS::Resource { public: using Resource::Resource; - Path() : Resource(std::shared_ptr()) {} + Path() : Resource(std::shared_ptr()) {} PathData* GetPointer(); size_t GetPointerSize(); @@ -26,4 +24,3 @@ public: std::vector pathData; std::vector> paths; }; -}; // namespace LUS diff --git a/soh/soh/resource/type/Scene.cpp b/soh/soh/resource/type/Scene.cpp index bfe219e54..5947a8bf4 100644 --- a/soh/soh/resource/type/Scene.cpp +++ b/soh/soh/resource/type/Scene.cpp @@ -1,6 +1,5 @@ #include "Scene.h" -namespace LUS { void* Scene::GetPointer() { // Scene is a special type that requries C++ processing. As such, we return nothing. return nullptr; @@ -9,4 +8,3 @@ void* Scene::GetPointer() { size_t Scene::GetPointerSize() { return 0; } -} // namespace LUS diff --git a/soh/soh/resource/type/Scene.h b/soh/soh/resource/type/Scene.h index f726da359..505c8308b 100644 --- a/soh/soh/resource/type/Scene.h +++ b/soh/soh/resource/type/Scene.h @@ -7,17 +7,14 @@ #include "scenecommand/SceneCommand.h" #include -namespace LUS { - -class Scene : public Resource { +class Scene : public LUS::Resource { public: using Resource::Resource; - Scene() : Resource(std::shared_ptr()) {} + Scene() : Resource(std::shared_ptr()) {} void* GetPointer(); size_t GetPointerSize(); std::vector> commands; }; -}; // namespace LUS diff --git a/soh/soh/resource/type/Skeleton.cpp b/soh/soh/resource/type/Skeleton.cpp index 13798d3c5..8cf4942c0 100644 --- a/soh/soh/resource/type/Skeleton.cpp +++ b/soh/soh/resource/type/Skeleton.cpp @@ -3,7 +3,6 @@ #include "soh/OTRGlobals.h" #include "libultraship/libultraship.h" -namespace LUS { SkeletonData* Skeleton::GetPointer() { return &skeletonData; } @@ -79,4 +78,3 @@ void SkeletonPatcher::UpdateSkeletons() { } } } -} // namespace LUS diff --git a/soh/soh/resource/type/Skeleton.h b/soh/soh/resource/type/Skeleton.h index 490614a44..91ff5d733 100644 --- a/soh/soh/resource/type/Skeleton.h +++ b/soh/soh/resource/type/Skeleton.h @@ -5,8 +5,6 @@ #include "SkeletonLimb.h" #include -namespace LUS { - enum class SkeletonType { Normal, Flex, @@ -50,11 +48,11 @@ union SkeletonData { SkelCurveLimbList skelCurveLimbList; }; -class Skeleton : public Resource { +class Skeleton : public LUS::Resource { public: using Resource::Resource; - Skeleton() : Resource(std::shared_ptr()) {} + Skeleton() : Resource(std::shared_ptr()) {} SkeletonData* GetPointer(); size_t GetPointerSize(); @@ -89,6 +87,3 @@ class SkeletonPatcher { static std::vector skeletons; }; - - -} // namespace LUS \ No newline at end of file diff --git a/soh/soh/resource/type/SkeletonLimb.cpp b/soh/soh/resource/type/SkeletonLimb.cpp index 8e5a8ef6d..831674622 100644 --- a/soh/soh/resource/type/SkeletonLimb.cpp +++ b/soh/soh/resource/type/SkeletonLimb.cpp @@ -1,6 +1,5 @@ #include "SkeletonLimb.h" -namespace LUS { SkeletonLimbData* SkeletonLimb::GetPointer() { return &limbData; } @@ -21,4 +20,3 @@ size_t SkeletonLimb::GetPointerSize() { return 0; } } -} // namespace LUS diff --git a/soh/soh/resource/type/SkeletonLimb.h b/soh/soh/resource/type/SkeletonLimb.h index 2110b3484..df16051d0 100644 --- a/soh/soh/resource/type/SkeletonLimb.h +++ b/soh/soh/resource/type/SkeletonLimb.h @@ -4,7 +4,6 @@ #include "libultraship/libultra.h" #include "z64math.h" -namespace LUS { enum class LimbType { Invalid, Standard, @@ -97,11 +96,11 @@ union SkeletonLimbData { SkinLimb skinLimb; }; -class SkeletonLimb : public Resource { +class SkeletonLimb : public LUS::Resource { public: using Resource::Resource; - SkeletonLimb() : Resource(std::shared_ptr()) {} + SkeletonLimb() : Resource(std::shared_ptr()) {} SkeletonLimbData* GetPointer(); size_t GetPointerSize(); @@ -131,4 +130,3 @@ public: std::vector> skinLimbModifVertexArrays; std::vector> skinLimbModifTransformationArrays; }; -} // namespace LUS \ No newline at end of file diff --git a/soh/soh/resource/type/Text.cpp b/soh/soh/resource/type/Text.cpp index eee289f8a..c912c2aad 100644 --- a/soh/soh/resource/type/Text.cpp +++ b/soh/soh/resource/type/Text.cpp @@ -1,6 +1,5 @@ #include "Text.h" -namespace LUS { MessageEntry* Text::GetPointer() { return messages.data(); } @@ -8,4 +7,3 @@ MessageEntry* Text::GetPointer() { size_t Text::GetPointerSize() { return messages.size() * sizeof(MessageEntry); } -} // namespace LUS diff --git a/soh/soh/resource/type/Text.h b/soh/soh/resource/type/Text.h index db0cb36a0..5151b8e7f 100644 --- a/soh/soh/resource/type/Text.h +++ b/soh/soh/resource/type/Text.h @@ -5,7 +5,6 @@ #include "Resource.h" #include -namespace LUS { // TODO: we've moved away from using classes for this stuff class MessageEntry { @@ -16,15 +15,14 @@ public: std::string msg; }; -class Text : public Resource { +class Text : public LUS::Resource { public: using Resource::Resource; - Text() : Resource(std::shared_ptr()) {} + Text() : Resource(std::shared_ptr()) {} MessageEntry* GetPointer(); size_t GetPointerSize(); std::vector messages; }; -}; // namespace LUS diff --git a/soh/soh/resource/type/scenecommand/EndMarker.cpp b/soh/soh/resource/type/scenecommand/EndMarker.cpp index 9d12c1518..d4eee349b 100644 --- a/soh/soh/resource/type/scenecommand/EndMarker.cpp +++ b/soh/soh/resource/type/scenecommand/EndMarker.cpp @@ -1,6 +1,5 @@ #include "EndMarker.h" -namespace LUS { Marker* EndMarker::GetPointer() { return &endMarker; } @@ -8,4 +7,3 @@ Marker* EndMarker::GetPointer() { size_t EndMarker::GetPointerSize() { return sizeof(Marker); } -} // namespace LUS diff --git a/soh/soh/resource/type/scenecommand/EndMarker.h b/soh/soh/resource/type/scenecommand/EndMarker.h index 9f981f1f9..ee953d0cc 100644 --- a/soh/soh/resource/type/scenecommand/EndMarker.h +++ b/soh/soh/resource/type/scenecommand/EndMarker.h @@ -7,7 +7,6 @@ #include "SceneCommand.h" #include -namespace LUS { typedef struct { } Marker; @@ -21,4 +20,3 @@ class EndMarker : public SceneCommand { Marker endMarker; }; -}; // namespace LUS diff --git a/soh/soh/resource/type/scenecommand/RomFile.h b/soh/soh/resource/type/scenecommand/RomFile.h index ebdc3dc3b..f946cf90c 100644 --- a/soh/soh/resource/type/scenecommand/RomFile.h +++ b/soh/soh/resource/type/scenecommand/RomFile.h @@ -2,10 +2,8 @@ #include -namespace LUS { - typedef struct { - /* 0x00 */ uintptr_t vromStart; - /* 0x04 */ uintptr_t vromEnd; - char* fileName; - } RomFile; // size = 0x8 -} \ No newline at end of file +typedef struct { + /* 0x00 */ uintptr_t vromStart; + /* 0x04 */ uintptr_t vromEnd; + char* fileName; +} RomFile; // size = 0x8 diff --git a/soh/soh/resource/type/scenecommand/SceneCommand.h b/soh/soh/resource/type/scenecommand/SceneCommand.h index 6fb845568..81d3380cd 100644 --- a/soh/soh/resource/type/scenecommand/SceneCommand.h +++ b/soh/soh/resource/type/scenecommand/SceneCommand.h @@ -6,8 +6,6 @@ #include "Resource.h" #include -namespace LUS { - enum class SceneCommandID : uint8_t { SetStartPositionList = 0x00, SetActorList = 0x01, @@ -47,10 +45,10 @@ enum class SceneCommandID : uint8_t { Error = 0xFF }; -class ISceneCommand : public IResource { +class ISceneCommand : public LUS::IResource { public: using IResource::IResource; - ISceneCommand() : IResource(std::shared_ptr()) {} + ISceneCommand() : IResource(std::shared_ptr()) {} SceneCommandID cmdId; }; @@ -62,5 +60,3 @@ template class SceneCommand : public ISceneCommand { return static_cast(GetPointer()); } }; - -}; // namespace LUS diff --git a/soh/soh/resource/type/scenecommand/SetActorList.cpp b/soh/soh/resource/type/scenecommand/SetActorList.cpp index d37ebb148..e7bf14eb3 100644 --- a/soh/soh/resource/type/scenecommand/SetActorList.cpp +++ b/soh/soh/resource/type/scenecommand/SetActorList.cpp @@ -1,6 +1,5 @@ #include "SetActorList.h" -namespace LUS { ActorEntry* SetActorList::GetPointer() { return actorList.data(); } @@ -8,4 +7,3 @@ ActorEntry* SetActorList::GetPointer() { size_t SetActorList::GetPointerSize() { return actorList.size() * sizeof(ActorEntry); } -} // namespace LUS diff --git a/soh/soh/resource/type/scenecommand/SetActorList.h b/soh/soh/resource/type/scenecommand/SetActorList.h index 117175d7d..e9fb36f8e 100644 --- a/soh/soh/resource/type/scenecommand/SetActorList.h +++ b/soh/soh/resource/type/scenecommand/SetActorList.h @@ -9,7 +9,6 @@ // #include #include "z64math.h" -namespace LUS { typedef struct { /* 0x00 */ s16 id; /* 0x02 */ Vec3s pos; @@ -27,4 +26,3 @@ class SetActorList : public SceneCommand { uint32_t numActors; std::vector actorList; }; -}; // namespace LUS diff --git a/soh/soh/resource/type/scenecommand/SetAlternateHeaders.cpp b/soh/soh/resource/type/scenecommand/SetAlternateHeaders.cpp index 15b3c97d4..614924724 100644 --- a/soh/soh/resource/type/scenecommand/SetAlternateHeaders.cpp +++ b/soh/soh/resource/type/scenecommand/SetAlternateHeaders.cpp @@ -1,6 +1,5 @@ #include "SetAlternateHeaders.h" -namespace LUS { void* SetAlternateHeaders::GetPointer() { // Like Scene, SetAlternateHeader is a special type that is only acted upon in C++. return nullptr; @@ -9,4 +8,3 @@ void* SetAlternateHeaders::GetPointer() { size_t SetAlternateHeaders::GetPointerSize() { return 0; } -} // namespace LUS diff --git a/soh/soh/resource/type/scenecommand/SetAlternateHeaders.h b/soh/soh/resource/type/scenecommand/SetAlternateHeaders.h index dc7272369..c876e8394 100644 --- a/soh/soh/resource/type/scenecommand/SetAlternateHeaders.h +++ b/soh/soh/resource/type/scenecommand/SetAlternateHeaders.h @@ -10,9 +10,6 @@ #include "RomFile.h" #include - -namespace LUS { - class SetAlternateHeaders : public SceneCommand { public: using SceneCommand::SceneCommand; @@ -23,4 +20,3 @@ class SetAlternateHeaders : public SceneCommand { uint32_t numHeaders; std::vector> headers; }; -}; // namespace LUS diff --git a/soh/soh/resource/type/scenecommand/SetCameraSettings.cpp b/soh/soh/resource/type/scenecommand/SetCameraSettings.cpp index e1d2967e7..80a515abb 100644 --- a/soh/soh/resource/type/scenecommand/SetCameraSettings.cpp +++ b/soh/soh/resource/type/scenecommand/SetCameraSettings.cpp @@ -1,6 +1,5 @@ #include "SetCameraSettings.h" -namespace LUS { CameraSettings* SetCameraSettings::GetPointer() { return &settings; } @@ -8,4 +7,3 @@ CameraSettings* SetCameraSettings::GetPointer() { size_t SetCameraSettings::GetPointerSize() { return sizeof(CameraSettings); } -} // namespace LUS diff --git a/soh/soh/resource/type/scenecommand/SetCameraSettings.h b/soh/soh/resource/type/scenecommand/SetCameraSettings.h index adbde2e02..85672c05d 100644 --- a/soh/soh/resource/type/scenecommand/SetCameraSettings.h +++ b/soh/soh/resource/type/scenecommand/SetCameraSettings.h @@ -7,7 +7,6 @@ #include "SceneCommand.h" #include -namespace LUS { typedef struct { int8_t cameraMovement; int32_t worldMapArea; @@ -22,4 +21,3 @@ class SetCameraSettings : public SceneCommand { CameraSettings settings; }; -}; // namespace LUS diff --git a/soh/soh/resource/type/scenecommand/SetCollisionHeader.cpp b/soh/soh/resource/type/scenecommand/SetCollisionHeader.cpp index db8cdcb32..56d31a471 100644 --- a/soh/soh/resource/type/scenecommand/SetCollisionHeader.cpp +++ b/soh/soh/resource/type/scenecommand/SetCollisionHeader.cpp @@ -1,6 +1,5 @@ #include "SetCollisionHeader.h" -namespace LUS { CollisionHeaderData* SetCollisionHeader::GetPointer() { if (collisionHeader == nullptr) { return nullptr; @@ -14,4 +13,3 @@ size_t SetCollisionHeader::GetPointerSize() { } return collisionHeader->GetPointerSize(); } -} // namespace LUS diff --git a/soh/soh/resource/type/scenecommand/SetCollisionHeader.h b/soh/soh/resource/type/scenecommand/SetCollisionHeader.h index 79573fe74..cea9403f6 100644 --- a/soh/soh/resource/type/scenecommand/SetCollisionHeader.h +++ b/soh/soh/resource/type/scenecommand/SetCollisionHeader.h @@ -9,7 +9,6 @@ #include "soh/resource/type/CollisionHeader.h" // #include -namespace LUS { class SetCollisionHeader : public SceneCommand { public: using SceneCommand::SceneCommand; @@ -21,4 +20,3 @@ class SetCollisionHeader : public SceneCommand { std::shared_ptr collisionHeader; }; -}; // namespace LUS diff --git a/soh/soh/resource/type/scenecommand/SetCsCamera.cpp b/soh/soh/resource/type/scenecommand/SetCsCamera.cpp index d3eafb803..666979de5 100644 --- a/soh/soh/resource/type/scenecommand/SetCsCamera.cpp +++ b/soh/soh/resource/type/scenecommand/SetCsCamera.cpp @@ -1,6 +1,5 @@ #include "SetCsCamera.h" -namespace LUS { CsCamera* SetCsCamera::GetPointer() { return &csCamera; } @@ -8,4 +7,3 @@ CsCamera* SetCsCamera::GetPointer() { size_t SetCsCamera::GetPointerSize() { return sizeof(CsCamera); } -} // namespace LUS diff --git a/soh/soh/resource/type/scenecommand/SetCsCamera.h b/soh/soh/resource/type/scenecommand/SetCsCamera.h index db0e3d682..0d71b9684 100644 --- a/soh/soh/resource/type/scenecommand/SetCsCamera.h +++ b/soh/soh/resource/type/scenecommand/SetCsCamera.h @@ -7,7 +7,6 @@ #include "SceneCommand.h" #include -namespace LUS { typedef struct { } CsCamera; @@ -21,4 +20,3 @@ class SetCsCamera : public SceneCommand { CsCamera csCamera; }; -}; // namespace LUS diff --git a/soh/soh/resource/type/scenecommand/SetCutscenes.cpp b/soh/soh/resource/type/scenecommand/SetCutscenes.cpp index 42d1326d5..e0960a50b 100644 --- a/soh/soh/resource/type/scenecommand/SetCutscenes.cpp +++ b/soh/soh/resource/type/scenecommand/SetCutscenes.cpp @@ -1,6 +1,5 @@ #include "SetCutscenes.h" -namespace LUS { uint32_t* SetCutscenes::GetPointer() { if (cutscene == nullptr) { return nullptr; @@ -14,4 +13,3 @@ size_t SetCutscenes::GetPointerSize() { } return cutscene->GetPointerSize(); } -} // namespace LUS diff --git a/soh/soh/resource/type/scenecommand/SetCutscenes.h b/soh/soh/resource/type/scenecommand/SetCutscenes.h index 482553934..1a8f41a1f 100644 --- a/soh/soh/resource/type/scenecommand/SetCutscenes.h +++ b/soh/soh/resource/type/scenecommand/SetCutscenes.h @@ -9,7 +9,6 @@ #include "soh/resource/type/Cutscene.h" // #include -namespace LUS { class SetCutscenes : public SceneCommand { public: using SceneCommand::SceneCommand; @@ -20,4 +19,3 @@ class SetCutscenes : public SceneCommand { std::string fileName; std::shared_ptr cutscene; }; -}; // namespace LUS diff --git a/soh/soh/resource/type/scenecommand/SetEchoSettings.cpp b/soh/soh/resource/type/scenecommand/SetEchoSettings.cpp index 47cfa85ad..edd95d3ba 100644 --- a/soh/soh/resource/type/scenecommand/SetEchoSettings.cpp +++ b/soh/soh/resource/type/scenecommand/SetEchoSettings.cpp @@ -1,6 +1,5 @@ #include "SetEchoSettings.h" -namespace LUS { EchoSettings* SetEchoSettings::GetPointer() { return &settings; } @@ -8,4 +7,3 @@ EchoSettings* SetEchoSettings::GetPointer() { size_t SetEchoSettings::GetPointerSize() { return sizeof(EchoSettings); } -} // namespace LUS diff --git a/soh/soh/resource/type/scenecommand/SetEchoSettings.h b/soh/soh/resource/type/scenecommand/SetEchoSettings.h index ea2f664d4..7eb6a1778 100644 --- a/soh/soh/resource/type/scenecommand/SetEchoSettings.h +++ b/soh/soh/resource/type/scenecommand/SetEchoSettings.h @@ -7,7 +7,6 @@ #include "SceneCommand.h" #include -namespace LUS { typedef struct { int8_t echo; } EchoSettings; @@ -21,4 +20,3 @@ class SetEchoSettings : public SceneCommand { EchoSettings settings; }; -}; // namespace LUS diff --git a/soh/soh/resource/type/scenecommand/SetEntranceList.cpp b/soh/soh/resource/type/scenecommand/SetEntranceList.cpp index d33ac189b..876ac62c4 100644 --- a/soh/soh/resource/type/scenecommand/SetEntranceList.cpp +++ b/soh/soh/resource/type/scenecommand/SetEntranceList.cpp @@ -1,6 +1,5 @@ #include "SetEntranceList.h" -namespace LUS { EntranceEntry* SetEntranceList::GetPointer() { return entrances.data(); } @@ -8,4 +7,3 @@ EntranceEntry* SetEntranceList::GetPointer() { size_t SetEntranceList::GetPointerSize() { return entrances.size() * sizeof(EntranceEntry); } -} // namespace LUS diff --git a/soh/soh/resource/type/scenecommand/SetEntranceList.h b/soh/soh/resource/type/scenecommand/SetEntranceList.h index d31dda78c..5f5fa7ae0 100644 --- a/soh/soh/resource/type/scenecommand/SetEntranceList.h +++ b/soh/soh/resource/type/scenecommand/SetEntranceList.h @@ -8,7 +8,6 @@ #include "SceneCommand.h" #include -namespace LUS { typedef struct { /* 0x00 */ u8 spawn; /* 0x01 */ u8 room; @@ -25,4 +24,3 @@ class SetEntranceList : public SceneCommand { std::vector entrances; }; -}; // namespace LUS diff --git a/soh/soh/resource/type/scenecommand/SetExitList.cpp b/soh/soh/resource/type/scenecommand/SetExitList.cpp index 99966cdb4..2e1500b1d 100644 --- a/soh/soh/resource/type/scenecommand/SetExitList.cpp +++ b/soh/soh/resource/type/scenecommand/SetExitList.cpp @@ -1,6 +1,5 @@ #include "SetExitList.h" -namespace LUS { uint16_t* SetExitList::GetPointer() { return exits.data(); } @@ -8,4 +7,3 @@ uint16_t* SetExitList::GetPointer() { size_t SetExitList::GetPointerSize() { return exits.size() * sizeof(int16_t); } -} // namespace LUS diff --git a/soh/soh/resource/type/scenecommand/SetExitList.h b/soh/soh/resource/type/scenecommand/SetExitList.h index c6f0b3f42..f589cd899 100644 --- a/soh/soh/resource/type/scenecommand/SetExitList.h +++ b/soh/soh/resource/type/scenecommand/SetExitList.h @@ -7,7 +7,6 @@ #include "SceneCommand.h" #include -namespace LUS { class SetExitList : public SceneCommand { public: using SceneCommand::SceneCommand; @@ -19,4 +18,3 @@ class SetExitList : public SceneCommand { std::vector exits; }; -}; // namespace LUS diff --git a/soh/soh/resource/type/scenecommand/SetLightList.cpp b/soh/soh/resource/type/scenecommand/SetLightList.cpp index c59f75c20..470632faa 100644 --- a/soh/soh/resource/type/scenecommand/SetLightList.cpp +++ b/soh/soh/resource/type/scenecommand/SetLightList.cpp @@ -1,6 +1,5 @@ #include "SetLightList.h" -namespace LUS { LightInfo* SetLightList::GetPointer() { return lightList.data(); } @@ -8,4 +7,3 @@ LightInfo* SetLightList::GetPointer() { size_t SetLightList::GetPointerSize() { return lightList.size() * sizeof(LightInfo); } -} // namespace LUS diff --git a/soh/soh/resource/type/scenecommand/SetLightList.h b/soh/soh/resource/type/scenecommand/SetLightList.h index bbc5aad3d..1ac84cd69 100644 --- a/soh/soh/resource/type/scenecommand/SetLightList.h +++ b/soh/soh/resource/type/scenecommand/SetLightList.h @@ -8,7 +8,6 @@ #include "SceneCommand.h" #include -namespace LUS { typedef struct { /* 0x0 */ s16 x; /* 0x2 */ s16 y; @@ -45,4 +44,3 @@ class SetLightList : public SceneCommand { uint32_t numLights; std::vector lightList; }; -}; // namespace LUS diff --git a/soh/soh/resource/type/scenecommand/SetLightingSettings.cpp b/soh/soh/resource/type/scenecommand/SetLightingSettings.cpp index 69127f19c..126f97775 100644 --- a/soh/soh/resource/type/scenecommand/SetLightingSettings.cpp +++ b/soh/soh/resource/type/scenecommand/SetLightingSettings.cpp @@ -1,6 +1,5 @@ #include "SetLightingSettings.h" -namespace LUS { EnvLightSettings* SetLightingSettings::GetPointer() { return settings.data(); } @@ -8,4 +7,3 @@ EnvLightSettings* SetLightingSettings::GetPointer() { size_t SetLightingSettings::GetPointerSize() { return settings.size() * sizeof(EnvLightSettings); } -} // namespace LUS diff --git a/soh/soh/resource/type/scenecommand/SetLightingSettings.h b/soh/soh/resource/type/scenecommand/SetLightingSettings.h index ca894fec3..447ad0fdd 100644 --- a/soh/soh/resource/type/scenecommand/SetLightingSettings.h +++ b/soh/soh/resource/type/scenecommand/SetLightingSettings.h @@ -7,7 +7,6 @@ #include "SceneCommand.h" #include -namespace LUS { typedef struct { /* 0x00 */ u8 ambientColor[3]; /* 0x03 */ s8 light1Dir[3]; @@ -28,4 +27,3 @@ class SetLightingSettings : public SceneCommand { std::vector settings; }; -}; // namespace LUS diff --git a/soh/soh/resource/type/scenecommand/SetMesh.cpp b/soh/soh/resource/type/scenecommand/SetMesh.cpp index 5ecd2cbfa..2b6d71647 100644 --- a/soh/soh/resource/type/scenecommand/SetMesh.cpp +++ b/soh/soh/resource/type/scenecommand/SetMesh.cpp @@ -1,6 +1,5 @@ #include "SetMesh.h" -namespace LUS { MeshHeader* SetMesh::GetPointer() { return &meshHeader; } @@ -8,4 +7,3 @@ MeshHeader* SetMesh::GetPointer() { size_t SetMesh::GetPointerSize() { return sizeof(MeshHeader); } -} // namespace LUS diff --git a/soh/soh/resource/type/scenecommand/SetMesh.h b/soh/soh/resource/type/scenecommand/SetMesh.h index a3a6c9731..90e48b1d5 100644 --- a/soh/soh/resource/type/scenecommand/SetMesh.h +++ b/soh/soh/resource/type/scenecommand/SetMesh.h @@ -8,7 +8,6 @@ #include "libultraship/libultra.h" #include "z64math.h" -namespace LUS { typedef struct { /* 0x00 */ u8 type; } PolygonBase; @@ -100,4 +99,3 @@ class SetMesh : public SceneCommand { std::vector images; MeshHeader meshHeader; }; -}; // namespace LUS diff --git a/soh/soh/resource/type/scenecommand/SetObjectList.cpp b/soh/soh/resource/type/scenecommand/SetObjectList.cpp index 921166675..481da4512 100644 --- a/soh/soh/resource/type/scenecommand/SetObjectList.cpp +++ b/soh/soh/resource/type/scenecommand/SetObjectList.cpp @@ -1,6 +1,5 @@ #include "SetObjectList.h" -namespace LUS { int16_t* SetObjectList::GetPointer() { return objects.data(); } @@ -8,4 +7,3 @@ int16_t* SetObjectList::GetPointer() { size_t SetObjectList::GetPointerSize() { return objects.size() * sizeof(int16_t); } -} // namespace LUS diff --git a/soh/soh/resource/type/scenecommand/SetObjectList.h b/soh/soh/resource/type/scenecommand/SetObjectList.h index c6f786636..091fc018c 100644 --- a/soh/soh/resource/type/scenecommand/SetObjectList.h +++ b/soh/soh/resource/type/scenecommand/SetObjectList.h @@ -8,7 +8,6 @@ #include "SceneCommand.h" #include -namespace LUS { class SetObjectList : public SceneCommand { public: using SceneCommand::SceneCommand; @@ -19,4 +18,3 @@ class SetObjectList : public SceneCommand { uint32_t numObjects; std::vector objects; }; -}; // namespace LUS diff --git a/soh/soh/resource/type/scenecommand/SetPathways.cpp b/soh/soh/resource/type/scenecommand/SetPathways.cpp index b69108ea6..3c9dd380a 100644 --- a/soh/soh/resource/type/scenecommand/SetPathways.cpp +++ b/soh/soh/resource/type/scenecommand/SetPathways.cpp @@ -1,6 +1,5 @@ #include "SetPathways.h" -namespace LUS { PathData** SetPathways::GetPointer() { return paths.data(); } @@ -8,4 +7,3 @@ PathData** SetPathways::GetPointer() { size_t SetPathways::GetPointerSize() { return paths.size() * sizeof(PathData*); } -} // namespace LUS diff --git a/soh/soh/resource/type/scenecommand/SetPathways.h b/soh/soh/resource/type/scenecommand/SetPathways.h index 5846c382f..8c2be3eb4 100644 --- a/soh/soh/resource/type/scenecommand/SetPathways.h +++ b/soh/soh/resource/type/scenecommand/SetPathways.h @@ -8,8 +8,6 @@ // #include #include "soh/resource/type/Path.h" -namespace LUS { - class SetPathways : public SceneCommand { public: using SceneCommand::SceneCommand; @@ -20,4 +18,3 @@ class SetPathways : public SceneCommand { uint32_t numPaths; std::vector paths; }; -}; // namespace LUS diff --git a/soh/soh/resource/type/scenecommand/SetRoomBehavior.cpp b/soh/soh/resource/type/scenecommand/SetRoomBehavior.cpp index deababc87..5320bf1f0 100644 --- a/soh/soh/resource/type/scenecommand/SetRoomBehavior.cpp +++ b/soh/soh/resource/type/scenecommand/SetRoomBehavior.cpp @@ -1,6 +1,5 @@ #include "SetRoomBehavior.h" -namespace LUS { RoomBehavior* SetRoomBehavior::GetPointer() { return &roomBehavior; } @@ -8,4 +7,3 @@ RoomBehavior* SetRoomBehavior::GetPointer() { size_t SetRoomBehavior::GetPointerSize() { return sizeof(RoomBehavior); } -} // namespace LUS diff --git a/soh/soh/resource/type/scenecommand/SetRoomBehavior.h b/soh/soh/resource/type/scenecommand/SetRoomBehavior.h index c2a28176e..8f0523816 100644 --- a/soh/soh/resource/type/scenecommand/SetRoomBehavior.h +++ b/soh/soh/resource/type/scenecommand/SetRoomBehavior.h @@ -7,7 +7,6 @@ #include "SceneCommand.h" #include -namespace LUS { typedef struct { int8_t gameplayFlags; int32_t gameplayFlags2; @@ -22,4 +21,3 @@ class SetRoomBehavior : public SceneCommand { RoomBehavior roomBehavior; }; -}; // namespace LUS diff --git a/soh/soh/resource/type/scenecommand/SetRoomList.cpp b/soh/soh/resource/type/scenecommand/SetRoomList.cpp index cf8c1d61a..9cd1b243b 100644 --- a/soh/soh/resource/type/scenecommand/SetRoomList.cpp +++ b/soh/soh/resource/type/scenecommand/SetRoomList.cpp @@ -1,6 +1,5 @@ #include "SetRoomList.h" -namespace LUS { RomFile* SetRoomList::GetPointer() { return rooms.data(); } @@ -8,4 +7,3 @@ RomFile* SetRoomList::GetPointer() { size_t SetRoomList::GetPointerSize() { return rooms.size() * sizeof(RomFile); } -} // namespace LUS diff --git a/soh/soh/resource/type/scenecommand/SetRoomList.h b/soh/soh/resource/type/scenecommand/SetRoomList.h index 66d83dc9c..853387578 100644 --- a/soh/soh/resource/type/scenecommand/SetRoomList.h +++ b/soh/soh/resource/type/scenecommand/SetRoomList.h @@ -9,14 +9,6 @@ #include "RomFile.h" #include - -namespace LUS { -// typedef struct { -// /* 0x00 */ uintptr_t vromStart; -// /* 0x04 */ uintptr_t vromEnd; -// char* fileName; -// } RomFile; // size = 0x8 - class SetRoomList : public SceneCommand { public: using SceneCommand::SceneCommand; @@ -29,4 +21,3 @@ class SetRoomList : public SceneCommand { std::vector fileNames; std::vector rooms; }; -}; // namespace LUS diff --git a/soh/soh/resource/type/scenecommand/SetSkyboxModifier.cpp b/soh/soh/resource/type/scenecommand/SetSkyboxModifier.cpp index 9926ec01a..e66382621 100644 --- a/soh/soh/resource/type/scenecommand/SetSkyboxModifier.cpp +++ b/soh/soh/resource/type/scenecommand/SetSkyboxModifier.cpp @@ -1,6 +1,5 @@ #include "SetSkyboxModifier.h" -namespace LUS { SkyboxModifier* SetSkyboxModifier::GetPointer() { return &modifier; } @@ -8,4 +7,3 @@ SkyboxModifier* SetSkyboxModifier::GetPointer() { size_t SetSkyboxModifier::GetPointerSize() { return sizeof(SkyboxModifier); } -} // namespace LUS diff --git a/soh/soh/resource/type/scenecommand/SetSkyboxModifier.h b/soh/soh/resource/type/scenecommand/SetSkyboxModifier.h index 6a54879e6..47032b048 100644 --- a/soh/soh/resource/type/scenecommand/SetSkyboxModifier.h +++ b/soh/soh/resource/type/scenecommand/SetSkyboxModifier.h @@ -7,7 +7,6 @@ #include "SceneCommand.h" #include -namespace LUS { typedef struct { uint8_t skyboxDisabled; uint8_t sunMoonDisabled; @@ -22,4 +21,3 @@ class SetSkyboxModifier : public SceneCommand { SkyboxModifier modifier; }; -}; // namespace LUS diff --git a/soh/soh/resource/type/scenecommand/SetSkyboxSettings.cpp b/soh/soh/resource/type/scenecommand/SetSkyboxSettings.cpp index 7f12d4fa3..21609193e 100644 --- a/soh/soh/resource/type/scenecommand/SetSkyboxSettings.cpp +++ b/soh/soh/resource/type/scenecommand/SetSkyboxSettings.cpp @@ -1,6 +1,5 @@ #include "SetSkyboxSettings.h" -namespace LUS { SkyboxSettings* SetSkyboxSettings::GetPointer() { return &settings; } @@ -8,4 +7,3 @@ SkyboxSettings* SetSkyboxSettings::GetPointer() { size_t SetSkyboxSettings::GetPointerSize() { return sizeof(SetSkyboxSettings); } -} // namespace LUS diff --git a/soh/soh/resource/type/scenecommand/SetSkyboxSettings.h b/soh/soh/resource/type/scenecommand/SetSkyboxSettings.h index a2a9593b0..e75075eee 100644 --- a/soh/soh/resource/type/scenecommand/SetSkyboxSettings.h +++ b/soh/soh/resource/type/scenecommand/SetSkyboxSettings.h @@ -7,7 +7,6 @@ #include "SceneCommand.h" #include -namespace LUS { typedef struct { uint8_t unk; uint8_t skyboxId; @@ -24,4 +23,3 @@ class SetSkyboxSettings : public SceneCommand { SkyboxSettings settings; }; -}; // namespace LUS diff --git a/soh/soh/resource/type/scenecommand/SetSoundSettings.cpp b/soh/soh/resource/type/scenecommand/SetSoundSettings.cpp index f6f1941d1..2fd3219fe 100644 --- a/soh/soh/resource/type/scenecommand/SetSoundSettings.cpp +++ b/soh/soh/resource/type/scenecommand/SetSoundSettings.cpp @@ -1,6 +1,5 @@ #include "SetSoundSettings.h" -namespace LUS { SoundSettings* SetSoundSettings::GetPointer() { return &settings; } @@ -8,4 +7,3 @@ SoundSettings* SetSoundSettings::GetPointer() { size_t SetSoundSettings::GetPointerSize() { return sizeof(SoundSettings); } -} // namespace LUS diff --git a/soh/soh/resource/type/scenecommand/SetSoundSettings.h b/soh/soh/resource/type/scenecommand/SetSoundSettings.h index c4ee4668d..2a9d5290a 100644 --- a/soh/soh/resource/type/scenecommand/SetSoundSettings.h +++ b/soh/soh/resource/type/scenecommand/SetSoundSettings.h @@ -7,7 +7,6 @@ #include "SceneCommand.h" #include -namespace LUS { typedef struct { uint8_t seqId; uint8_t natureAmbienceId; @@ -23,4 +22,3 @@ class SetSoundSettings : public SceneCommand { SoundSettings settings; }; -}; // namespace LUS diff --git a/soh/soh/resource/type/scenecommand/SetSpecialObjects.cpp b/soh/soh/resource/type/scenecommand/SetSpecialObjects.cpp index 3887107da..c4a7531aa 100644 --- a/soh/soh/resource/type/scenecommand/SetSpecialObjects.cpp +++ b/soh/soh/resource/type/scenecommand/SetSpecialObjects.cpp @@ -1,6 +1,5 @@ #include "SetSpecialObjects.h" -namespace LUS { SpecialObjects* SetSpecialObjects::GetPointer() { return &specialObjects; } @@ -8,4 +7,3 @@ SpecialObjects* SetSpecialObjects::GetPointer() { size_t SetSpecialObjects::GetPointerSize() { return sizeof(SpecialObjects); } -} // namespace LUS diff --git a/soh/soh/resource/type/scenecommand/SetSpecialObjects.h b/soh/soh/resource/type/scenecommand/SetSpecialObjects.h index 78cfcd425..2a23d087b 100644 --- a/soh/soh/resource/type/scenecommand/SetSpecialObjects.h +++ b/soh/soh/resource/type/scenecommand/SetSpecialObjects.h @@ -7,7 +7,6 @@ #include "SceneCommand.h" #include -namespace LUS { typedef struct { int8_t elfMessage; int16_t globalObject; @@ -22,4 +21,3 @@ class SetSpecialObjects : public SceneCommand { SpecialObjects specialObjects; }; -}; // namespace LUS diff --git a/soh/soh/resource/type/scenecommand/SetStartPositionList.cpp b/soh/soh/resource/type/scenecommand/SetStartPositionList.cpp index 89fb40049..7a57c4d4a 100644 --- a/soh/soh/resource/type/scenecommand/SetStartPositionList.cpp +++ b/soh/soh/resource/type/scenecommand/SetStartPositionList.cpp @@ -1,6 +1,5 @@ #include "SetStartPositionList.h" -namespace LUS { ActorEntry* SetStartPositionList::GetPointer() { return startPositions.data(); } @@ -8,4 +7,3 @@ ActorEntry* SetStartPositionList::GetPointer() { size_t SetStartPositionList::GetPointerSize() { return startPositions.size() * sizeof(ActorEntry); } -} // namespace LUS diff --git a/soh/soh/resource/type/scenecommand/SetStartPositionList.h b/soh/soh/resource/type/scenecommand/SetStartPositionList.h index 1c5d4242f..896e14dfa 100644 --- a/soh/soh/resource/type/scenecommand/SetStartPositionList.h +++ b/soh/soh/resource/type/scenecommand/SetStartPositionList.h @@ -9,14 +9,6 @@ #include "soh/resource/type/scenecommand/SetActorList.h" // #include -namespace LUS { -// typedef struct { -// /* 0x00 */ s16 id; -// /* 0x02 */ Vec3s pos; -// /* 0x08 */ Vec3s rot; -// /* 0x0E */ s16 params; -// } ActorEntry; // size = 0x10 - class SetStartPositionList : public SceneCommand { public: using SceneCommand::SceneCommand; @@ -27,4 +19,3 @@ class SetStartPositionList : public SceneCommand { uint32_t numStartPositions; std::vector startPositions; }; -}; // namespace LUS diff --git a/soh/soh/resource/type/scenecommand/SetTimeSettings.cpp b/soh/soh/resource/type/scenecommand/SetTimeSettings.cpp index 9a10fb022..7c1484754 100644 --- a/soh/soh/resource/type/scenecommand/SetTimeSettings.cpp +++ b/soh/soh/resource/type/scenecommand/SetTimeSettings.cpp @@ -1,6 +1,5 @@ #include "SetTimeSettings.h" -namespace LUS { TimeSettings* SetTimeSettings::GetPointer() { return &settings; } @@ -8,4 +7,3 @@ TimeSettings* SetTimeSettings::GetPointer() { size_t SetTimeSettings::GetPointerSize() { return sizeof(TimeSettings); } -} // namespace LUS diff --git a/soh/soh/resource/type/scenecommand/SetTimeSettings.h b/soh/soh/resource/type/scenecommand/SetTimeSettings.h index 637398652..7d307f396 100644 --- a/soh/soh/resource/type/scenecommand/SetTimeSettings.h +++ b/soh/soh/resource/type/scenecommand/SetTimeSettings.h @@ -7,7 +7,6 @@ #include "SceneCommand.h" #include -namespace LUS { typedef struct { uint8_t hour; uint8_t minute; @@ -23,4 +22,3 @@ class SetTimeSettings : public SceneCommand { TimeSettings settings; }; -}; // namespace LUS diff --git a/soh/soh/resource/type/scenecommand/SetTransitionActorList.cpp b/soh/soh/resource/type/scenecommand/SetTransitionActorList.cpp index 86387e682..069d767c0 100644 --- a/soh/soh/resource/type/scenecommand/SetTransitionActorList.cpp +++ b/soh/soh/resource/type/scenecommand/SetTransitionActorList.cpp @@ -1,6 +1,5 @@ #include "SetTransitionActorList.h" -namespace LUS { TransitionActorEntry* SetTransitionActorList::GetPointer() { return transitionActorList.data(); } @@ -8,4 +7,3 @@ TransitionActorEntry* SetTransitionActorList::GetPointer() { size_t SetTransitionActorList::GetPointerSize() { return transitionActorList.size() * sizeof(TransitionActorEntry); } -} // namespace LUS diff --git a/soh/soh/resource/type/scenecommand/SetTransitionActorList.h b/soh/soh/resource/type/scenecommand/SetTransitionActorList.h index bb6fc2ac6..7a6978fb0 100644 --- a/soh/soh/resource/type/scenecommand/SetTransitionActorList.h +++ b/soh/soh/resource/type/scenecommand/SetTransitionActorList.h @@ -9,7 +9,6 @@ // #include #include "z64math.h" -namespace LUS { typedef struct { struct { s8 room; // Room to switch to @@ -31,4 +30,3 @@ class SetTransitionActorList : public SceneCommand { uint32_t numTransitionActors; std::vector transitionActorList; }; -}; // namespace LUS diff --git a/soh/soh/resource/type/scenecommand/SetWindSettings.cpp b/soh/soh/resource/type/scenecommand/SetWindSettings.cpp index 3aa9ce7a6..8eb3101e3 100644 --- a/soh/soh/resource/type/scenecommand/SetWindSettings.cpp +++ b/soh/soh/resource/type/scenecommand/SetWindSettings.cpp @@ -1,6 +1,5 @@ #include "SetWindSettings.h" -namespace LUS { WindSettings* SetWindSettings::GetPointer() { return &settings; } @@ -8,4 +7,3 @@ WindSettings* SetWindSettings::GetPointer() { size_t SetWindSettings::GetPointerSize() { return sizeof(WindSettings); } -} // namespace LUS diff --git a/soh/soh/resource/type/scenecommand/SetWindSettings.h b/soh/soh/resource/type/scenecommand/SetWindSettings.h index e79b445ae..f5f1304cd 100644 --- a/soh/soh/resource/type/scenecommand/SetWindSettings.h +++ b/soh/soh/resource/type/scenecommand/SetWindSettings.h @@ -7,7 +7,6 @@ #include "SceneCommand.h" #include -namespace LUS { typedef struct { int8_t windWest; int8_t windVertical; @@ -24,4 +23,3 @@ class SetWindSettings : public SceneCommand { WindSettings settings; }; -}; // namespace LUS