diff --git a/src/port/resource/importers/ObjectInitFactory.cpp b/src/port/resource/importers/ObjectInitFactory.cpp index 9ebe330c..b8965b8d 100644 --- a/src/port/resource/importers/ObjectInitFactory.cpp +++ b/src/port/resource/importers/ObjectInitFactory.cpp @@ -12,7 +12,7 @@ std::shared_ptr ResourceFactoryBinaryObjectInitV0::ReadResource return nullptr; } - auto obj = std::make_shared(initData); + auto obj = std::make_shared(initData); auto reader = std::get>(file->Reader); auto count = reader->ReadUInt32(); diff --git a/src/port/resource/type/ObjectInit.cpp b/src/port/resource/type/ObjectInit.cpp index 3fe6e95b..766befe3 100644 --- a/src/port/resource/type/ObjectInit.cpp +++ b/src/port/resource/type/ObjectInit.cpp @@ -1,11 +1,11 @@ #include "ObjectInit.h" namespace SF64 { -ObjectInitData* ObjectInit::GetPointer() { +ObjectInitData* ObjectInitResource::GetPointer() { return mObjects.data(); } -size_t ObjectInit::GetPointerSize() { +size_t ObjectInitResource::GetPointerSize() { return sizeof(ObjectInitData) * mObjects.size(); } } \ No newline at end of file diff --git a/src/port/resource/type/ObjectInit.h b/src/port/resource/type/ObjectInit.h index e6da7023..3e57240c 100644 --- a/src/port/resource/type/ObjectInit.h +++ b/src/port/resource/type/ObjectInit.h @@ -16,11 +16,12 @@ struct ObjectInitData { /* 0x10 */ int16_t id; }; // size = 0x14 -class ObjectInit : public Ship::Resource { +// Renamed from ObjectInit to prevent clashing with Torch of same namespace +class ObjectInitResource : public Ship::Resource { public: using Resource::Resource; - ObjectInit() : Resource(std::shared_ptr()) {} + ObjectInitResource() : Resource(std::shared_ptr()) {} ObjectInitData* GetPointer(); size_t GetPointerSize();