mirror of
https://github.com/zeldaret/botw
synced 2026-10-10 14:00:58 -04:00
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:
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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_);
|
||||
|
||||
@@ -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
|
||||
Reference in New Issue
Block a user