diff --git a/lib/sead b/lib/sead index be07bdf3..09f3cdd5 160000 --- a/lib/sead +++ b/lib/sead @@ -1 +1 @@ -Subproject commit be07bdf3a2053cc22d353793d0875564180b1997 +Subproject commit 09f3cdd5c83e0bcf6e67eb983e3f992e17f44b39 diff --git a/src/KingSystem/ActorSystem/actASSetting.h b/src/KingSystem/ActorSystem/actASSetting.h index 82d9873a..79731bd6 100644 --- a/src/KingSystem/ActorSystem/actASSetting.h +++ b/src/KingSystem/ActorSystem/actASSetting.h @@ -7,6 +7,7 @@ namespace ksys::act { // FIXME: very incomplete class ASSetting { SEAD_SINGLETON_DISPOSER(ASSetting) + ASSetting() = default; }; } // namespace ksys::act diff --git a/src/KingSystem/ActorSystem/actActorFactory.h b/src/KingSystem/ActorSystem/actActorFactory.h index 77729030..6fed82f4 100644 --- a/src/KingSystem/ActorSystem/actActorFactory.h +++ b/src/KingSystem/ActorSystem/actActorFactory.h @@ -16,6 +16,7 @@ public: class ActorFactoryHolder { SEAD_SINGLETON_DISPOSER(ActorFactoryHolder) + ActorFactoryHolder() = default; virtual ~ActorFactoryHolder(); public: diff --git a/src/KingSystem/ActorSystem/actActorTemplate.h b/src/KingSystem/ActorSystem/actActorTemplate.h index dc2fbbe8..31cdf20b 100644 --- a/src/KingSystem/ActorSystem/actActorTemplate.h +++ b/src/KingSystem/ActorSystem/actActorTemplate.h @@ -11,6 +11,7 @@ namespace ksys::act { class ActorTemplate { SEAD_SINGLETON_DISPOSER(ActorTemplate) + ActorTemplate() = default; virtual ~ActorTemplate(); public: diff --git a/src/KingSystem/ActorSystem/actBaseProcLink.h b/src/KingSystem/ActorSystem/actBaseProcLink.h index 4d42d642..5d997c29 100644 --- a/src/KingSystem/ActorSystem/actBaseProcLink.h +++ b/src/KingSystem/ActorSystem/actBaseProcLink.h @@ -87,6 +87,7 @@ KSYS_CHECK_SIZE_NX150(BaseProcLinkData, 0x58); class BaseProcLinkDataMgr { SEAD_SINGLETON_DISPOSER(BaseProcLinkDataMgr) + BaseProcLinkDataMgr() = default; public: bool acquireLink(BaseProc* proc); diff --git a/src/KingSystem/ActorSystem/actDebug.h b/src/KingSystem/ActorSystem/actDebug.h index 29495c25..8e7b10d8 100644 --- a/src/KingSystem/ActorSystem/actDebug.h +++ b/src/KingSystem/ActorSystem/actDebug.h @@ -8,6 +8,7 @@ namespace ksys::act { class ActorDebug { SEAD_SINGLETON_DISPOSER(ActorDebug) + ActorDebug(); virtual ~ActorDebug(); public: diff --git a/src/KingSystem/Damage/dmgDamageInfoManager.h b/src/KingSystem/Damage/dmgDamageInfoManager.h index e9c0a052..dc09e2bf 100644 --- a/src/KingSystem/Damage/dmgDamageInfoManager.h +++ b/src/KingSystem/Damage/dmgDamageInfoManager.h @@ -13,6 +13,8 @@ namespace ksys::dmg { class DamageInfoMgr { public: SEAD_SINGLETON_DISPOSER(DamageInfoMgr); + DamageInfoMgr(); + virtual ~DamageInfoMgr(); public: // FIXME: incomplete @@ -22,7 +24,7 @@ public: sead::SafeArray mCanTakeDamageFromType; }; - u8 TEMP1[0x5F8]; // Fields + u8 TEMP1[0x5F0]; // Fields res::Handle* mReactionTable; // 0x5D0 sead::Buffer mDamagesArray; // 0x620 }; diff --git a/src/KingSystem/Map/mapPlacementMgr.h b/src/KingSystem/Map/mapPlacementMgr.h index adac1cc2..8a8f0220 100644 --- a/src/KingSystem/Map/mapPlacementMgr.h +++ b/src/KingSystem/Map/mapPlacementMgr.h @@ -103,12 +103,15 @@ KSYS_CHECK_SIZE_NX150(PlacementActors, 0x2A80D0); class PlacementMgr { SEAD_SINGLETON_DISPOSER(PlacementMgr) + PlacementMgr(); + virtual ~PlacementMgr(); + public: enum class MgrFlag { _1000000 = 0x1000000, }; - u8 TEMP1[0x1D0]; + u8 TEMP1[0x1C8]; PlacementActors* mPlacementActors; u8 TEMP2[0x48C]; sead::TypedBitFlag> mFlags; diff --git a/src/KingSystem/Resource/resCurrentResNameMgr.h b/src/KingSystem/Resource/resCurrentResNameMgr.h index ed63e01d..b46487b7 100644 --- a/src/KingSystem/Resource/resCurrentResNameMgr.h +++ b/src/KingSystem/Resource/resCurrentResNameMgr.h @@ -10,6 +10,8 @@ namespace ksys::res { /// Stubbed in release builds. class CurrentResNameMgr { SEAD_SINGLETON_DISPOSER(CurrentResNameMgr) + CurrentResNameMgr() = default; + public: void init(sead::Heap* heap); sead::SafeString getCurrentResName() const; diff --git a/src/KingSystem/Sound/sndResource.h b/src/KingSystem/Sound/sndResource.h index c17e570a..31a502fa 100644 --- a/src/KingSystem/Sound/sndResource.h +++ b/src/KingSystem/Sound/sndResource.h @@ -8,6 +8,7 @@ namespace ksys::snd { // FIXME: incomplete class SoundResource { SEAD_SINGLETON_DISPOSER(SoundResource) + SoundResource() = default; virtual ~SoundResource(); public: diff --git a/src/KingSystem/System/KingEditor.h b/src/KingSystem/System/KingEditor.h index 2b103d2f..ffd97660 100644 --- a/src/KingSystem/System/KingEditor.h +++ b/src/KingSystem/System/KingEditor.h @@ -16,6 +16,7 @@ public: // FIXME class KingEditor { SEAD_SINGLETON_DISPOSER(KingEditor) + KingEditor() = default; public: void registerComponent(KingEditorComponent* component); diff --git a/src/KingSystem/System/PlayReportMgr.h b/src/KingSystem/System/PlayReportMgr.h index 12c43940..bfcca3aa 100644 --- a/src/KingSystem/System/PlayReportMgr.h +++ b/src/KingSystem/System/PlayReportMgr.h @@ -19,6 +19,7 @@ class ProductReporter; class PlayReportMgr { SEAD_SINGLETON_DISPOSER(PlayReportMgr) + PlayReportMgr() = default; virtual ~PlayReportMgr(); public: diff --git a/src/KingSystem/Utils/HeapUtil.cpp b/src/KingSystem/Utils/HeapUtil.cpp index 30118e44..5a8ae4b4 100644 --- a/src/KingSystem/Utils/HeapUtil.cpp +++ b/src/KingSystem/Utils/HeapUtil.cpp @@ -7,6 +7,8 @@ namespace ksys::util { // Name, layout and purpose unknown; this is stubbed in release builds class DebugHeapHolder { SEAD_SINGLETON_DISPOSER(DebugHeapHolder) + DebugHeapHolder() = default; + public: virtual ~DebugHeapHolder() = default; virtual sead::Heap* getHeap() { return nullptr; } @@ -17,6 +19,8 @@ SEAD_SINGLETON_DISPOSER_IMPL(DebugHeapHolder) // Name, layout and purpose unknown; this is stubbed in release builds class DebugHeapHolder2 { SEAD_SINGLETON_DISPOSER(DebugHeapHolder2) + DebugHeapHolder2() = default; + public: virtual ~DebugHeapHolder2() = default; virtual sead::Heap* getHeap() { return nullptr; }