summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLéo Lam <leo@leolam.fr>2026-09-28 03:39:31 +0200
committerLéo Lam <leo@leolam.fr>2026-10-06 03:19:38 +0200
commit4a6239bbbf5b5ab78c8d7eebb7afeeb79601ff43 (patch)
tree0a5245d45e05662181aee8bcc9dd9a5663136baf /src
parentd8da4fc5f2f159f2ea3386d7018e61629759bc09 (diff)
ksys: small declaration fixes
setCamera's only caller passes the camera actor, a ksys::act::Actor; ksys::act::Camera is only forward-declared. (AI assisted using Claude Fable 5.1 and Claude Opus 5.5)
Diffstat (limited to 'src')
-rw-r--r--src/KingSystem/ActorSystem/actActorCaptureMgr.cpp2
-rw-r--r--src/KingSystem/ActorSystem/actActorCaptureMgr.h5
-rw-r--r--src/KingSystem/Map/mapObject.cpp2
-rw-r--r--src/KingSystem/Map/mapObject.h2
-rw-r--r--src/KingSystem/Resource/resEntryFactory.h2
-rw-r--r--src/KingSystem/System/NXArgs.cpp3
6 files changed, 6 insertions, 10 deletions
diff --git a/src/KingSystem/ActorSystem/actActorCaptureMgr.cpp b/src/KingSystem/ActorSystem/actActorCaptureMgr.cpp
index 32f1525b..1c2c0096 100644
--- a/src/KingSystem/ActorSystem/actActorCaptureMgr.cpp
+++ b/src/KingSystem/ActorSystem/actActorCaptureMgr.cpp
@@ -30,7 +30,7 @@ void ActorCaptureMgr::init(const InitArg& arg) {
mDummyFile.load("Actor/ActorCapture/Dummy.bactcapt", &req);
}
-void ActorCaptureMgr::setCamera(Camera* camera) {
+void ActorCaptureMgr::setCamera(Actor* camera) {
if (camera)
mCamera = camera;
}
diff --git a/src/KingSystem/ActorSystem/actActorCaptureMgr.h b/src/KingSystem/ActorSystem/actActorCaptureMgr.h
index 091fde8d..b71e531a 100644
--- a/src/KingSystem/ActorSystem/actActorCaptureMgr.h
+++ b/src/KingSystem/ActorSystem/actActorCaptureMgr.h
@@ -14,7 +14,6 @@ class EntryFactoryBase;
namespace ksys::act {
class Actor;
-class Camera;
// TODO: incomplete
class ActorCaptureMgr {
@@ -27,14 +26,14 @@ public:
virtual ~ActorCaptureMgr();
void init(const InitArg& arg);
- void setCamera(Camera* camera);
+ void setCamera(Actor* camera);
void loadCaptureParam();
const char* getCapturedActorName() const;
private:
Actor* mActor{};
- Camera* mCamera{};
+ Actor* mCamera{};
res::EntryFactoryBase* mFactory{};
res::Handle mDummyFile;
res::Handle mCaptureParamFile;
diff --git a/src/KingSystem/Map/mapObject.cpp b/src/KingSystem/Map/mapObject.cpp
index f2173ac5..10c94cbb 100644
--- a/src/KingSystem/Map/mapObject.cpp
+++ b/src/KingSystem/Map/mapObject.cpp
@@ -327,7 +327,7 @@ Object* Object::findPlacementLODLinkObject(const PlacementActors*) const {
return nullptr;
}
-Object* Object::findPlacementLODLinkObject() const {
+Object* Object::findPlacementLODLinkObject_0(const PlacementActors*) const {
if (!mLinkData)
return nullptr;
diff --git a/src/KingSystem/Map/mapObject.h b/src/KingSystem/Map/mapObject.h
index e3634c80..5233846d 100644
--- a/src/KingSystem/Map/mapObject.h
+++ b/src/KingSystem/Map/mapObject.h
@@ -150,7 +150,7 @@ public:
void getUniqueName(const char** out) const;
Object* findPlacementLODLinkObject(const PlacementActors* unused) const;
- Object* findPlacementLODLinkObject() const;
+ Object* findPlacementLODLinkObject_0(const PlacementActors* unused) const;
const char* getHashIdStringDebug() const;
const char* getHashIdStringDebug_0() const;
diff --git a/src/KingSystem/Resource/resEntryFactory.h b/src/KingSystem/Resource/resEntryFactory.h
index 071f70e3..3a6e30f6 100644
--- a/src/KingSystem/Resource/resEntryFactory.h
+++ b/src/KingSystem/Resource/resEntryFactory.h
@@ -36,7 +36,7 @@ public:
: EntryFactoryBase(size_multiplier, size_constant) {}
u32 getResourceSize() const override { return sizeof(T); }
- u32 getLoadDataAlignment() const override { return T::cLoadDataAlignment; }
+ u32 getLoadDataAlignment() const override { return mResource.getLoadDataAlignment(); }
sead::DirectResource* newResource_(sead::Heap* heap_, s32 alignment) override {
sead::Heap* heap = util::getHeapOrCurrentHeap(heap_);
diff --git a/src/KingSystem/System/NXArgs.cpp b/src/KingSystem/System/NXArgs.cpp
index 9738dabf..46df7f39 100644
--- a/src/KingSystem/System/NXArgs.cpp
+++ b/src/KingSystem/System/NXArgs.cpp
@@ -75,7 +75,4 @@ void nxargs::allocEntries(sead::Heap* heap, const u8* data) {
}
}
-// todo: placeholder to hide the warning in tools/check
-void nxargs::handleArgs() {}
-
} // namespace ksys \ No newline at end of file