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)
This commit is contained in:
Léo Lam
2026-09-28 03:39:31 +02:00
parent d8da4fc5f2
commit 4a6239bbbf
7 changed files with 9 additions and 13 deletions
+3 -3
View File
@@ -53162,7 +53162,7 @@ Address,Quality,Size,Name
0x000000710089cb4c,U,000040,
0x000000710089cb74,O,000276,_ZN4ksys3act15ActorCaptureMgrC1Ev
0x000000710089cc88,O,000332,_ZN4ksys3act15ActorCaptureMgr4initERKNS1_7InitArgE
0x000000710089cdd4,O,000012,_ZN4ksys3act15ActorCaptureMgr9setCameraEPNS0_6CameraE
0x000000710089cdd4,O,000012,_ZN4ksys3act15ActorCaptureMgr9setCameraEPNS0_5ActorE
0x000000710089cde0,U,004112,ActorCaptureMgr::x_1
0x000000710089ddf0,O,000224,_ZN4sead21FormatFixedSafeStringILi1024EEC2EPKcz
0x000000710089ded0,U,000572,ActorCaptureMgr::calc
@@ -54428,7 +54428,7 @@ Address,Quality,Size,Name
0x0000007100901ce0,U,000148,nxargs::dtorDelete
0x0000007100901d74,O,000804,_ZN4ksys6nxargs4initEPN4sead4HeapE
0x0000007100902098,O,000632,_ZN4ksys6nxargs12allocEntriesEPN4sead4HeapEPKh
0x0000007100902310,W,000320,_ZN4ksys6nxargs10handleArgsEv
0x0000007100902310,U,000320,_ZN4ksys6nxargs10handleArgsEv
0x0000007100902450,U,002848,
0x0000007100902f70,U,000004,j__ZdlPv_410
0x0000007100902f74,U,000240,_ZN4sead15FixedSafeStringILi37EEaSERKNS_14SafeStringBaseIcEE
@@ -74326,7 +74326,7 @@ Address,Quality,Size,Name
0x0000007100d4c3dc,U,000968,PlacementObj::getDispDistanceComplex
0x0000007100d4c7a4,O,000092,_ZNK4ksys3map6Object26getUnitConfigNameFromByamlEv
0x0000007100d4c800,O,000052,_ZNK4ksys3map6Object26findPlacementLODLinkObjectEPKNS0_15PlacementActorsE
0x0000007100d4c834,O,000052,_ZNK4ksys3map6Object26findPlacementLODLinkObjectEv
0x0000007100d4c834,O,000052,_ZNK4ksys3map6Object28findPlacementLODLinkObject_0EPKNS0_15PlacementActorsE
0x0000007100d4c868,U,000040,PlacementObj::getPlacementLODLinkObj_0
0x0000007100d4c890,U,000040,PlacementLinkData::getPlacementLODLinkObj
0x0000007100d4c8b8,O,000108,_ZNK4ksys3map6Object20getHashIdStringDebugEv
Can't render this file because it is too large.
@@ -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;
}
@@ -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;
+1 -1
View File
@@ -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;
+1 -1
View File
@@ -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;
+1 -1
View File
@@ -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_);
-3
View File
@@ -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