mirror of
https://github.com/MonsterDruide1/OdysseyDecomp
synced 2026-04-23 09:04:21 +00:00
all: More fixes for new lints (#908)
This commit is contained in:
LynxDev2
GitHub
parent
82e4518bf3
commit
03ab3f345f
|
|
@ -8,7 +8,7 @@ class AreaShapeCube : public AreaShape {
|
|||
public:
|
||||
enum class OriginType { Center, Base, Top };
|
||||
|
||||
AreaShapeCube(AreaShapeCube::OriginType originType);
|
||||
AreaShapeCube(OriginType originType);
|
||||
|
||||
bool isInVolume(const sead::Vector3f& pos) const override;
|
||||
bool isInVolumeOffset(const sead::Vector3f& pos, f32 offset) const override;
|
||||
|
|
@ -20,7 +20,7 @@ public:
|
|||
bool isInLocalVolume(const sead::Vector3f& pos) const;
|
||||
|
||||
private:
|
||||
AreaShapeCube::OriginType mOriginType;
|
||||
OriginType mOriginType;
|
||||
};
|
||||
|
||||
class AreaShapeCubeBase : public AreaShapeCube {
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ class AreaShapeCylinder : public AreaShape {
|
|||
public:
|
||||
enum class OriginType { Center, Base, Top };
|
||||
|
||||
AreaShapeCylinder(AreaShapeCylinder::OriginType originType);
|
||||
AreaShapeCylinder(OriginType originType);
|
||||
|
||||
bool isInVolume(const sead::Vector3f& pos) const override;
|
||||
bool isInVolumeOffset(const sead::Vector3f& pos, f32 offset) const override;
|
||||
|
|
@ -18,7 +18,7 @@ public:
|
|||
bool calcLocalBoundingBox(sead::BoundBox3f* boundingBox) const override;
|
||||
|
||||
private:
|
||||
AreaShapeCylinder::OriginType mOriginType;
|
||||
OriginType mOriginType;
|
||||
};
|
||||
|
||||
class AreaShapeCylinderBase : public AreaShapeCylinder {
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ class CameraTargetHolder {
|
|||
public:
|
||||
CameraTargetHolder(s32 maxTargets);
|
||||
|
||||
void initAfterPlacement(const PlayerHolder*);
|
||||
void initAfterPlacement(const PlayerHolder* holder);
|
||||
CameraTargetBase* tryGetViewTarget(s32 index) const;
|
||||
void update();
|
||||
void addTarget(CameraTargetBase* target);
|
||||
|
|
|
|||
|
|
@ -31,6 +31,7 @@ public:
|
|||
return (mParent->*mFunc)(triangle);
|
||||
}
|
||||
|
||||
private:
|
||||
T* mParent;
|
||||
DelegateFilter mFunc;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -179,9 +179,9 @@ void calcTouchScreenPos(sead::Vector2f* pos);
|
|||
void calcTouchLayoutPos(sead::Vector2f* pos);
|
||||
|
||||
bool isTouchPosInRect(const sead::Vector2f& rect_pos, const sead::Vector2f& size);
|
||||
bool isTouchPosInCircle(const sead::Vector2f&, f32);
|
||||
bool isTouchPosInCircle(const sead::Vector2f& center, f32 radius);
|
||||
bool isTouchPosInCircleByWorldPos(const sead::Vector3f&, const IUseCamera*, f32, f32);
|
||||
bool isPadTouchRect(f32, f32, f32, f32);
|
||||
bool isPadTouchRect(f32 left, f32 top, f32 width, f32 height);
|
||||
|
||||
// TODO: rename parameters
|
||||
void setPadRepeat(s32 a1, s32 a2, s32 a3, s32 port);
|
||||
|
|
|
|||
|
|
@ -14,12 +14,13 @@ class LayoutSystem;
|
|||
class MessageSystem;
|
||||
class SceneObjHolder;
|
||||
|
||||
void initLayoutInitInfo(LayoutInitInfo*, const LayoutKit*, SceneObjHolder*, const AudioDirector*,
|
||||
const LayoutSystem*, const MessageSystem*, const GamePadSystem*);
|
||||
void initLayoutInitInfo(LayoutInitInfo* info, const LayoutKit* kit, SceneObjHolder* sceneObjHolder,
|
||||
const AudioDirector* audioDirector, const LayoutSystem* layoutSystem,
|
||||
const MessageSystem* messageSystem, const GamePadSystem* gamePadSystem);
|
||||
void setRenderBuffer(LayoutKit*, const agl::RenderBuffer*);
|
||||
void executeUpdate(LayoutKit*);
|
||||
void executeUpdateList(LayoutKit*, const char*, const char*);
|
||||
void executeUpdateEffect(LayoutKit*);
|
||||
void executeDraw(const LayoutKit*, const char*);
|
||||
void executeDrawEffect(const LayoutKit*);
|
||||
void executeUpdateList(LayoutKit* kit, const char* tableName, const char* listName);
|
||||
void executeUpdateEffect(LayoutKit* kit);
|
||||
void executeDraw(const LayoutKit* kit, const char* tableName);
|
||||
void executeDrawEffect(const LayoutKit* kit);
|
||||
} // namespace al
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ Collider* getActorCollider(const LiveActor* actor);
|
|||
bool isExistActorCollider(const LiveActor* actor);
|
||||
const HitSensor* getActorCollisionPartsSensor(const LiveActor* actor);
|
||||
bool isExistCollisionParts(const LiveActor* actor);
|
||||
bool isEqualCollisionParts(const LiveActor* actor, const CollisionParts*);
|
||||
bool isEqualCollisionParts(const LiveActor* actor, const CollisionParts* collisionParts);
|
||||
void validateCollisionParts(LiveActor* actor);
|
||||
void invalidateCollisionParts(LiveActor* actor);
|
||||
void validateCollisionPartsBySystem(LiveActor* actor);
|
||||
|
|
@ -29,18 +29,18 @@ bool isCollidedGroundEdgeOrCorner(const LiveActor* actor);
|
|||
bool isOnGroundNoVelocity(const LiveActor* actor, u32 coyoteTime);
|
||||
bool isOnGroundDegree(const LiveActor* actor, f32 angle, u32 coyoteTime);
|
||||
bool isOnGroundFaceDegree(const LiveActor* actor, f32 angle);
|
||||
bool isOnGroundNoVelocityDegree(const LiveActor* actor, f32, u32 angle);
|
||||
bool isOnGroundNoVelocityDegree(const LiveActor* actor, f32 angle, u32 coyoteTime);
|
||||
const sead::Vector3f& getOnGroundNormal(const LiveActor* actor, u32 offset);
|
||||
void setColliderRadius(LiveActor* actor, f32 radius);
|
||||
void setColliderOffsetY(LiveActor* actor, f32 offsetY);
|
||||
void setColliderOffsetY(LiveActor* actor, f32 offsety);
|
||||
f32 getColliderRadius(const LiveActor* actor);
|
||||
f32 getColliderOffsetY(const LiveActor* actor);
|
||||
const sead::Vector3f& getColliderFixReaction(const LiveActor* actor);
|
||||
void calcColliderPos(sead::Vector3f*, const LiveActor* actor);
|
||||
void calcColliderPos(sead::Vector3f* outPos, const LiveActor* actor);
|
||||
void validateColliderRobustCheck(LiveActor* actor);
|
||||
void invalidateColliderRobustCheck(LiveActor* actor);
|
||||
void setColliderReactMovePower(LiveActor* actor, bool isEnabled);
|
||||
void calcColliderFloorRotatePower(sead::Quatf*, LiveActor* actor);
|
||||
void calcColliderFloorRotatePower(sead::Quatf* outRotatePower, LiveActor* actor);
|
||||
void calcJumpInertia(sead::Vector3f* outJumpInertia, LiveActor* actor,
|
||||
const sead::Vector3f& velocityDir, f32 force);
|
||||
bool isCollidedGround(const LiveActor* actor);
|
||||
|
|
@ -50,9 +50,9 @@ void scaleVelocityInertiaWallHit(LiveActor* actor, f32 velocityScaleH, f32 maxVe
|
|||
f32 maxScaledVelocityH);
|
||||
const sead::Vector3f& getCollidedWallNormal(const LiveActor* actor);
|
||||
void calcCollidedNormalSum(const LiveActor* actor, sead::Vector3f* outNormal);
|
||||
void calcGroundNormalOrUpDir(sead::Vector3f*, const LiveActor* actor);
|
||||
void calcGroundNormalOrUpDir(sead::Vector3f* outDir, const LiveActor* actor);
|
||||
const sead::Vector3f& getCollidedGroundNormal(const LiveActor* actor);
|
||||
void calcGroundNormalOrGravityDir(sead::Vector3f*, const LiveActor* actor);
|
||||
void calcGroundNormalOrGravityDir(sead::Vector3f* outDir, const LiveActor* actor);
|
||||
void setColliderFilterTriangle(LiveActor* actor, const TriangleFilterBase* triangleFilter);
|
||||
void setColliderFilterCollisionParts(LiveActor* actor,
|
||||
const CollisionPartsFilterBase* collisionPartsFilter);
|
||||
|
|
@ -108,7 +108,7 @@ HitSensor* tryGetCollidedWallSensor(const LiveActor* actor);
|
|||
HitSensor* getCollidedCeilingSensor(const LiveActor* actor);
|
||||
HitSensor* tryGetCollidedCeilingSensor(const LiveActor* actor);
|
||||
HitSensor* tryGetCollidedSensor(const LiveActor* actor);
|
||||
bool tryGetCollidedPos(sead::Vector3f*, const LiveActor* actor);
|
||||
bool tryGetCollidedPos(sead::Vector3f* outPos, const LiveActor* actor);
|
||||
void setForceCollisionScaleOne(const LiveActor* actor);
|
||||
void followRotateFrontAxisUpGround(LiveActor* actor);
|
||||
void followRotateFrontAxisUp(LiveActor* actor, const CollisionParts* collisionParts);
|
||||
|
|
|
|||
|
|
@ -55,60 +55,82 @@ void initActorPoseTQSV(LiveActor* actor);
|
|||
void initActorPoseTQGSV(LiveActor* actor);
|
||||
void initActorPoseTQGMSV(LiveActor* actor);
|
||||
void initActorSRT(LiveActor* actor, const ActorInitInfo& info);
|
||||
void initActorModelKeeper(LiveActor*, const ActorInitInfo&, const ActorResource*, s32);
|
||||
void initActorModelKeeper(LiveActor*, const ActorInitInfo&, const char*, s32, const char*);
|
||||
void initActorModelKeeperByHost(LiveActor*, const LiveActor*);
|
||||
void initActorModelForceCubeMap(LiveActor*, const ActorInitInfo&);
|
||||
void initActorActionKeeper(LiveActor*, const ActorInitInfo&, const char*, const char*);
|
||||
void initActorActionKeeper(LiveActor*, const ActorResource*, const char*, const char*);
|
||||
void initActorEffectKeeper(LiveActor*, const ActorInitInfo&, const char*);
|
||||
void initActorSeKeeper(LiveActor*, const ActorInitInfo&, const char*, const sead::Vector3f*,
|
||||
const sead::Matrix34f*);
|
||||
void initActorSeKeeper(LiveActor*, const ActorInitInfo&, const char*);
|
||||
void initActorSeKeeperWithout3D(LiveActor*, const ActorInitInfo&, const char*);
|
||||
void initActorBgmKeeper(LiveActor*, const ActorInitInfo&, const char*);
|
||||
bool isInitializedBgmKeeper(LiveActor*);
|
||||
void initHitReactionKeeper(LiveActor*, const char*);
|
||||
void initHitReactionKeeper(LiveActor*, const Resource*, const char*);
|
||||
void initActorParamHolder(LiveActor*, const char*);
|
||||
void initActorParamHolder(LiveActor*, const Resource*, const char*);
|
||||
void initDepthShadowMapCtrl(LiveActor*, const Resource*, const ActorInitInfo&, const char*);
|
||||
void initDepthShadowMapCtrlWithoutIter(LiveActor*, s32, bool);
|
||||
void addDepthShadowMapInfo(const LiveActor*, const char*, s32, s32, s32, f32, bool,
|
||||
const sead::Vector3f&, bool, const sead::Vector3f&,
|
||||
const sead::Vector3f&, bool, const char*, s32, bool, f32, f32, f32, bool,
|
||||
bool, f32, s32, bool);
|
||||
void declareUseDepthShadowMap(const LiveActor*, s32);
|
||||
void createDepthShadowMap(const LiveActor*, const char*, s32, s32, s32);
|
||||
void initShadowMaskCtrl(LiveActor*, const ActorInitInfo&, const ByamlIter&, const char*);
|
||||
void initShadowMaskCtrlWithoutInitFile(LiveActor*, const ActorInitInfo&, s32);
|
||||
void createShadowMaskSphere(LiveActor*, const char*, const char*, const char*);
|
||||
void createShadowMaskCube(LiveActor*, const char*, const char*, const char*, const sead::Color4f&,
|
||||
const sead::Vector3f&, f32, f32, f32, const sead::Vector3f&, f32);
|
||||
void createShadowMaskCylinder(LiveActor*, const char*, const char*, const char*,
|
||||
const sead::Color4f&, const sead::Vector3f&, f32, f32, f32, f32, f32);
|
||||
void createShadowMaskCastOvalCylinder(LiveActor*, const char*, const char*, const char*,
|
||||
const sead::Color4f&, const sead::Vector3f&,
|
||||
const sead::Vector3f&, f32, f32, f32, f32);
|
||||
void initActorCollision(LiveActor*, const sead::SafeString&, HitSensor*, const sead::Matrix34f*);
|
||||
void initActorCollisionWithResource(LiveActor*, const Resource*, const sead::SafeString&,
|
||||
HitSensor*, const sead::Matrix34f*, const char*);
|
||||
void initActorCollisionWithArchiveName(LiveActor*, const sead::SafeString&, const sead::SafeString&,
|
||||
HitSensor*, const sead::Matrix34f*);
|
||||
void initActorCollisionWithFilePtr(LiveActor*, void*, const void*, HitSensor*,
|
||||
const sead::Matrix34f*, const char*, const char*, s32);
|
||||
void initStageSwitch(LiveActor*, const ActorInitInfo&);
|
||||
void initActorItemKeeper(LiveActor*, const ActorInitInfo&, const ByamlIter&);
|
||||
bool initActorPrePassLightKeeper(LiveActor*, const Resource*, const ActorInitInfo&, const char*);
|
||||
void initActorOcclusionKeeper(LiveActor*, const Resource*, const ActorInitInfo&, const char*);
|
||||
void initSubActorKeeper(LiveActor*, const ActorInitInfo&, const char*, s32);
|
||||
void initSubActorKeeperNoFile(LiveActor*, const ActorInitInfo&, s32);
|
||||
void registerSubActor(LiveActor*, LiveActor*);
|
||||
void registerSubActorSyncClipping(LiveActor*, LiveActor*);
|
||||
void registerSubActorSyncClippingAndHide(LiveActor*, LiveActor*);
|
||||
void registerSubActorSyncAll(LiveActor*, LiveActor*);
|
||||
void setSubActorOffSyncClipping(LiveActor*);
|
||||
void initScreenPointKeeper(LiveActor*, const Resource*, const ActorInitInfo&, const char*);
|
||||
void initScreenPointKeeperNoYaml(LiveActor*, s32);
|
||||
void initActorMaterialCategory(LiveActor*, const ActorInitInfo&, const char*);
|
||||
void initActorModelKeeper(LiveActor* actor, const ActorInitInfo& info,
|
||||
const ActorResource* resource, s32 blendAnimMax);
|
||||
void initActorModelKeeper(LiveActor* actor, const ActorInitInfo& info, const char* actorResource,
|
||||
s32 blendAnimMax, const char* animResource);
|
||||
void initActorModelKeeperByHost(LiveActor* actor, const LiveActor* host);
|
||||
void initActorModelForceCubeMap(LiveActor* actor, const ActorInitInfo& info);
|
||||
void initActorActionKeeper(LiveActor* actor, const ActorInitInfo& info,
|
||||
const char* modelArchiveName, const char* suffix);
|
||||
void initActorActionKeeper(LiveActor* actor, const ActorResource* resource,
|
||||
const char* modelArchiveName, const char* suffix);
|
||||
void initActorEffectKeeper(LiveActor* actor, const ActorInitInfo& info, const char* name);
|
||||
void initActorSeKeeper(LiveActor* actor, const ActorInitInfo& info, const char* seName,
|
||||
const sead::Vector3f* transPtr, const sead::Matrix34f* baseMtx);
|
||||
void initActorSeKeeper(LiveActor* actor, const ActorInitInfo& info, const char* seName);
|
||||
void initActorSeKeeperWithout3D(LiveActor* actor, const ActorInitInfo& info, const char* seName);
|
||||
void initActorBgmKeeper(LiveActor* actor, const ActorInitInfo& info, const char* bgmName);
|
||||
bool isInitializedBgmKeeper(LiveActor* actor);
|
||||
void initHitReactionKeeper(LiveActor* actor, const char* suffix);
|
||||
void initHitReactionKeeper(LiveActor* actor, const Resource* resource, const char* suffix);
|
||||
void initActorParamHolder(LiveActor* actor, const char* suffix);
|
||||
void initActorParamHolder(LiveActor* actor, const Resource* resource, const char* suffix);
|
||||
void initDepthShadowMapCtrl(LiveActor* actor, const Resource* resource, const ActorInitInfo& info,
|
||||
const char* suffix);
|
||||
void initDepthShadowMapCtrlWithoutIter(LiveActor* actor, s32 size, bool isAppendSubActor);
|
||||
void addDepthShadowMapInfo(const LiveActor* actor, const char* a1, s32 a2, s32 a3, s32 a4, f32 a5,
|
||||
bool a6, const sead::Vector3f& a7, bool a8, const sead::Vector3f& a9,
|
||||
const sead::Vector3f& a10, bool a11, const char* a12, s32 a13, bool a14,
|
||||
f32 a15, f32 a16, f32 a17, bool a18, bool a19, f32 a20, s32 a21,
|
||||
bool a22);
|
||||
void declareUseDepthShadowMap(const LiveActor* actor, s32 num);
|
||||
void createDepthShadowMap(const LiveActor* actor, const char* a1, s32 a2, s32 a3, s32 a4);
|
||||
void initShadowMaskCtrl(LiveActor* actor, const ActorInitInfo& info, const ByamlIter& iter,
|
||||
const char* unused);
|
||||
void initShadowMaskCtrlWithoutInitFile(LiveActor* actor, const ActorInitInfo& info, s32 numMasks);
|
||||
void createShadowMaskSphere(LiveActor* actor, const char* name, const char* jointName,
|
||||
const char* drawCategory);
|
||||
void createShadowMaskCube(LiveActor* actor, const char* name, const char* jointName,
|
||||
const char* drawCategory, const sead::Color4f& color,
|
||||
const sead::Vector3f& offset, f32 a2, f32 a3, f32 dropLength,
|
||||
const sead::Vector3f& a5, f32 a6);
|
||||
void createShadowMaskCylinder(LiveActor* actor, const char* name, const char* jointName,
|
||||
const char* drawCategory, const sead::Color4f& color,
|
||||
const sead::Vector3f& offset, f32 a2, f32 dropLength, f32 a3, f32 a5,
|
||||
f32 a6);
|
||||
void createShadowMaskCastOvalCylinder(LiveActor* actor, const char* name, const char* jointName,
|
||||
const char* drawCategory, const sead::Color4f& color,
|
||||
const sead::Vector3f& offset, const sead::Vector3f& scale,
|
||||
f32 dropLength, f32 expXZ, f32 expY, f32 distYBase);
|
||||
void initActorCollision(LiveActor* actor, const sead::SafeString& filePath,
|
||||
HitSensor* connectedSensor, const sead::Matrix34f* jointMtx);
|
||||
void initActorCollisionWithResource(LiveActor* actor, const Resource* resource,
|
||||
const sead::SafeString& filePath, HitSensor* connectedSensor,
|
||||
const sead::Matrix34f* jointMtx, const char* suffix);
|
||||
void initActorCollisionWithArchiveName(LiveActor* actor, const sead::SafeString& resourceName,
|
||||
const sead::SafeString& filePath, HitSensor* connectedSensor,
|
||||
const sead::Matrix34f* jointMtx);
|
||||
void initActorCollisionWithFilePtr(LiveActor* actor, void* kcl, const void* byml,
|
||||
HitSensor* connectedSensor, const sead::Matrix34f* jointMtx,
|
||||
const char* specialPurpose, const char* optionalPurpose,
|
||||
s32 priority);
|
||||
void initStageSwitch(LiveActor* actor, const ActorInitInfo& info);
|
||||
void initActorItemKeeper(LiveActor* actor, const ActorInitInfo& info, const ByamlIter& iter);
|
||||
bool initActorPrePassLightKeeper(LiveActor* actor, const Resource* resource,
|
||||
const ActorInitInfo& info, const char* suffix);
|
||||
void initActorOcclusionKeeper(LiveActor* actor, const Resource* resource, const ActorInitInfo& info,
|
||||
const char* fileSuffix);
|
||||
void initSubActorKeeper(LiveActor* actor, const ActorInitInfo& info, const char* suffix,
|
||||
s32 maxSubActors);
|
||||
void initSubActorKeeperNoFile(LiveActor* actor, const ActorInitInfo& info, s32 maxSubActors);
|
||||
void registerSubActor(LiveActor* actor, LiveActor* subActor);
|
||||
void registerSubActorSyncClipping(LiveActor* actor, LiveActor* subActor);
|
||||
void registerSubActorSyncClippingAndHide(LiveActor* actor, LiveActor* subActor);
|
||||
void registerSubActorSyncAll(LiveActor* actor, LiveActor* subActor);
|
||||
void setSubActorOffSyncClipping(LiveActor* actor);
|
||||
void initScreenPointKeeper(LiveActor* actor, const Resource* resource, const ActorInitInfo& info,
|
||||
const char* fileName);
|
||||
void initScreenPointKeeperNoYaml(LiveActor* actor, s32 size);
|
||||
void initActorMaterialCategory(LiveActor* actor, const ActorInitInfo& info, const char* a1);
|
||||
} // namespace al
|
||||
|
|
|
|||
|
|
@ -140,7 +140,7 @@ void lerpExponentVecEaseIn(sead::Vector3f* outVec, const sead::Vector3f& a, cons
|
|||
f32 max, f32 min);
|
||||
void lerpExponentVecEaseOut(sead::Vector3f* outVec, const sead::Vector3f& a,
|
||||
const sead::Vector3f& b, f32 max, f32 min);
|
||||
f32 clampLeapMinAbs(f32 a, f32 beforeLerp, f32 startLerp, f32 endLerp);
|
||||
f32 clampLeapMinAbs(f32 t, f32 beforeLerp, f32 startLerp, f32 endLerp);
|
||||
f32 hermite(f32 y0, f32 m0, f32 y1, f32 m1, f32 t);
|
||||
f32 hermite(f32 y0, f32 m0, f32 y1, f32 m1, f32 t, f32 width);
|
||||
void hermiteVec(sead::Vector3f* outVec, const sead::Vector3f& y0, const sead::Vector3f& m0,
|
||||
|
|
@ -157,7 +157,7 @@ f32 diffNearAngleDegree(f32 a, f32 b);
|
|||
bool isInRangeAngleDegree(f32, f32, f32);
|
||||
bool calcEyesAnimAngleInRange(f32*, const sead::Vector3f&, const sead::Vector3f&,
|
||||
const sead::Vector3f&, const sead::Vector3f&, f32, f32, f32, f32);
|
||||
bool isSameSign(f32, f32);
|
||||
bool isSameSign(f32 a, f32 b);
|
||||
u8 reverseBit8(u8 x);
|
||||
u16 reverseBit16(u16 x);
|
||||
u32 reverseBit32(u32 x);
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ public:
|
|||
ModelDrawerChromakey(const char* name, bool, bool, bool, bool);
|
||||
|
||||
void createTable() override;
|
||||
void registerModel(ModelCtrl*) override;
|
||||
void registerModel(ModelCtrl* model) override;
|
||||
void draw() const override;
|
||||
|
||||
private:
|
||||
|
|
|
|||
|
|
@ -11,8 +11,8 @@ public:
|
|||
|
||||
void createTable() override;
|
||||
void draw() const override;
|
||||
void addModel(ModelCtrl*) override;
|
||||
void removeModel(ModelCtrl*) override;
|
||||
void addModel(ModelCtrl* model) override;
|
||||
void removeModel(ModelCtrl* model) override;
|
||||
|
||||
private:
|
||||
bool _50;
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ public:
|
|||
void draw() const override;
|
||||
|
||||
private:
|
||||
char _filler[0x10];
|
||||
char _50[0x10];
|
||||
};
|
||||
|
||||
static_assert(sizeof(ModelDrawerDeferredSilhouette) == 0x60);
|
||||
|
|
|
|||
|
|
@ -11,10 +11,10 @@ public:
|
|||
|
||||
void createTable() override;
|
||||
void draw() const override;
|
||||
void registerModel(ModelCtrl*) override;
|
||||
void addModel(ModelCtrl*) override;
|
||||
void removeModel(ModelCtrl*) override;
|
||||
void updateModel(ModelCtrl*) override;
|
||||
void registerModel(ModelCtrl* model) override;
|
||||
void addModel(ModelCtrl* model) override;
|
||||
void removeModel(ModelCtrl* model) override;
|
||||
void updateModel(ModelCtrl* model) override;
|
||||
|
||||
virtual void createTableCulling();
|
||||
|
||||
|
|
|
|||
|
|
@ -10,9 +10,9 @@ public:
|
|||
ModelDrawerDepthShadow(const char* name, bool, bool);
|
||||
|
||||
void createTable() override;
|
||||
void registerModel(ModelCtrl*) override;
|
||||
void addModel(ModelCtrl*) override;
|
||||
void updateModel(ModelCtrl*) override;
|
||||
void registerModel(ModelCtrl* model) override;
|
||||
void addModel(ModelCtrl* model) override;
|
||||
void updateModel(ModelCtrl* model) override;
|
||||
void draw() const override;
|
||||
|
||||
private:
|
||||
|
|
|
|||
|
|
@ -11,8 +11,8 @@ public:
|
|||
|
||||
void createTable() override;
|
||||
void draw() const override;
|
||||
void addModel(ModelCtrl*) override;
|
||||
void removeModel(ModelCtrl*) override;
|
||||
void addModel(ModelCtrl* model) override;
|
||||
void removeModel(ModelCtrl* model) override;
|
||||
|
||||
private:
|
||||
bool _50;
|
||||
|
|
|
|||
|
|
@ -10,9 +10,9 @@ public:
|
|||
|
||||
void createTable() override;
|
||||
void draw() const override;
|
||||
void registerModel(ModelCtrl*) override;
|
||||
void addModel(ModelCtrl*) override;
|
||||
void updateModel(ModelCtrl*) override;
|
||||
void registerModel(ModelCtrl* model) override;
|
||||
void addModel(ModelCtrl* model) override;
|
||||
void updateModel(ModelCtrl* model) override;
|
||||
};
|
||||
|
||||
static_assert(sizeof(ModelDrawerPrepassCulling) == 0x50);
|
||||
|
|
|
|||
|
|
@ -10,8 +10,8 @@ public:
|
|||
ModelDrawerStaticDepthShadow(const char* name);
|
||||
|
||||
void createTable() override;
|
||||
void addModel(ModelCtrl*) override;
|
||||
void removeModel(ModelCtrl*) override;
|
||||
void addModel(ModelCtrl* model) override;
|
||||
void removeModel(ModelCtrl* model) override;
|
||||
void draw() const override;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -10,8 +10,8 @@ public:
|
|||
|
||||
void createTable() override;
|
||||
void draw() const override;
|
||||
void addModel(ModelCtrl*) override;
|
||||
void removeModel(ModelCtrl*) override;
|
||||
void addModel(ModelCtrl* model) override;
|
||||
void removeModel(ModelCtrl* model) override;
|
||||
};
|
||||
|
||||
static_assert(sizeof(ModelDrawerWorldAo) == 0x50);
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ class CameraTicket;
|
|||
class KeyMoveCameraObj : public LiveActor {
|
||||
public:
|
||||
KeyMoveCameraObj(const char*);
|
||||
void init(const ActorInitInfo&) override;
|
||||
void init(const ActorInitInfo& info) override;
|
||||
void initAfterPlacement() override;
|
||||
void switchCamera(s32);
|
||||
void appear() override;
|
||||
|
|
|
|||
|
|
@ -8,57 +8,61 @@ class LiveActor;
|
|||
class PadRumbleKeeper;
|
||||
class PlayerHolder;
|
||||
|
||||
s32 getPlayerNumMax(const LiveActor*);
|
||||
s32 getPlayerNumMax(const LiveActor* actor);
|
||||
s32 getPlayerNumMax(const PlayerHolder* holder);
|
||||
s32 getAlivePlayerNum(const LiveActor*);
|
||||
s32 getAlivePlayerNum(const LiveActor* actor);
|
||||
s32 getAlivePlayerNum(const PlayerHolder* holder);
|
||||
LiveActor* getPlayerActor(const LiveActor*, s32);
|
||||
LiveActor* getPlayerActor(const LiveActor* actor, s32 index);
|
||||
LiveActor* getPlayerActor(const PlayerHolder* holder, s32 index);
|
||||
const sead::Vector3f& getPlayerPos(const LiveActor*, s32);
|
||||
const sead::Vector3f& getPlayerPos(const LiveActor* actor, s32 index);
|
||||
const sead::Vector3f& getPlayerPos(const PlayerHolder* holder, s32 index);
|
||||
LiveActor* tryGetPlayerActor(const LiveActor*, s32);
|
||||
LiveActor* tryGetPlayerActor(const LiveActor* actor, s32 index);
|
||||
LiveActor* tryGetPlayerActor(const PlayerHolder* holder, s32 index);
|
||||
bool isPlayerDead(const LiveActor*, s32);
|
||||
bool isPlayerDead(const LiveActor* actor, s32 index);
|
||||
bool isPlayerDead(const PlayerHolder* holder, s32 index);
|
||||
bool isPlayerAreaTarget(const LiveActor*, s32);
|
||||
bool isPlayerAreaTarget(const LiveActor* actor, s32 index);
|
||||
bool isPlayerAreaTarget(const PlayerHolder* holder, s32 index);
|
||||
LiveActor* tryFindAlivePlayerActorFirst(const LiveActor*);
|
||||
LiveActor* tryFindAlivePlayerActorFirst(const LiveActor* actor);
|
||||
LiveActor* tryFindAlivePlayerActorFirst(const PlayerHolder* holder);
|
||||
LiveActor* findAlivePlayerActorFirst(const LiveActor*);
|
||||
LiveActor* findAlivePlayerActorFirst(const LiveActor* actor);
|
||||
LiveActor* findAlivePlayerActorFirst(const PlayerHolder* holder);
|
||||
PadRumbleKeeper* getPlayerPadRumbleKeeper(const LiveActor*, s32);
|
||||
s32 getPlayerPort(const PlayerHolder*, s32);
|
||||
s32 getPlayerPort(const LiveActor*, s32);
|
||||
LiveActor* findAlivePlayerActorFromPort(const PlayerHolder*, s32);
|
||||
LiveActor* tryFindAlivePlayerActorFromPort(const PlayerHolder*, s32);
|
||||
LiveActor* findAlivePlayerActorFromPort(const LiveActor*, s32);
|
||||
LiveActor* tryFindAlivePlayerActorFromPort(const LiveActor*, s32);
|
||||
s32 findNearestPlayerId(const LiveActor*, f32);
|
||||
LiveActor* findNearestPlayerActor(const LiveActor*);
|
||||
LiveActor* tryFindNearestPlayerActor(const LiveActor*);
|
||||
const sead::Vector3f& findNearestPlayerPos(const LiveActor*);
|
||||
bool tryFindNearestPlayerPos(sead::Vector3f*, const LiveActor*);
|
||||
bool tryFindNearestPlayerDisatanceFromTarget(f32*, const LiveActor*, const sead::Vector3f&);
|
||||
bool isNearPlayer(const LiveActor*, f32);
|
||||
bool isNearPlayerH(const LiveActor*, f32);
|
||||
bool isNearPlayerHCondition(const LiveActor*, f32, bool (*)(const LiveActor*));
|
||||
const sead::Vector3f& getFarPlayerPosMaxX(const LiveActor*);
|
||||
const sead::Vector3f& getFarPlayerPosMinX(const LiveActor*);
|
||||
u32 calcPlayerListOrderByDistance(const LiveActor*, const LiveActor**, u32);
|
||||
u32 calcAlivePlayerActor(const LiveActor*, const LiveActor**, u32);
|
||||
LiveActor* tryFindNearestPlayerActorCondition(const LiveActor*, bool (*)(const LiveActor*));
|
||||
bool tryFindNearestPlayerPosCondition(sead::Vector3f*, const LiveActor*,
|
||||
bool (*)(const LiveActor*));
|
||||
bool isResetablePlayerPos(const LiveActor*, const sead::Vector3f&, f32, f32);
|
||||
bool isResetablePlayerPos(const LiveActor*, f32);
|
||||
void faceToPlayer(LiveActor*);
|
||||
PadRumbleKeeper* getPlayerPadRumbleKeeper(const LiveActor* actor, s32 index);
|
||||
s32 getPlayerPort(const PlayerHolder* holder, s32 index);
|
||||
s32 getPlayerPort(const LiveActor* actor, s32 index);
|
||||
LiveActor* findAlivePlayerActorFromPort(const PlayerHolder* holder, s32 port);
|
||||
LiveActor* tryFindAlivePlayerActorFromPort(const PlayerHolder* holder, s32 port);
|
||||
LiveActor* findAlivePlayerActorFromPort(const LiveActor* actor, s32 port);
|
||||
LiveActor* tryFindAlivePlayerActorFromPort(const LiveActor* actor, s32 port);
|
||||
s32 findNearestPlayerId(const LiveActor* actor, f32 threshold);
|
||||
LiveActor* findNearestPlayerActor(const LiveActor* actor);
|
||||
LiveActor* tryFindNearestPlayerActor(const LiveActor* actor);
|
||||
const sead::Vector3f& findNearestPlayerPos(const LiveActor* actor);
|
||||
bool tryFindNearestPlayerPos(sead::Vector3f* pos, const LiveActor* actor);
|
||||
bool tryFindNearestPlayerDisatanceFromTarget(f32* distance, const LiveActor* actor,
|
||||
const sead::Vector3f& target);
|
||||
bool isNearPlayer(const LiveActor* actor, f32 threshold);
|
||||
bool isNearPlayerH(const LiveActor* actor, f32 threshold);
|
||||
bool isNearPlayerHCondition(const LiveActor* actor, f32 threshold,
|
||||
bool (*condition)(const LiveActor*));
|
||||
const sead::Vector3f& getFarPlayerPosMaxX(const LiveActor* actor);
|
||||
const sead::Vector3f& getFarPlayerPosMinX(const LiveActor* actor);
|
||||
u32 calcPlayerListOrderByDistance(const LiveActor* actor, const LiveActor** actorList, u32 size);
|
||||
u32 calcAlivePlayerActor(const LiveActor* actor, const LiveActor** actorList, u32 size);
|
||||
LiveActor* tryFindNearestPlayerActorCondition(const LiveActor* actor,
|
||||
bool (*condition)(const LiveActor*));
|
||||
bool tryFindNearestPlayerPosCondition(sead::Vector3f* pos, const LiveActor* actor,
|
||||
bool (*condition)(const LiveActor*));
|
||||
bool isResetablePlayerPos(const LiveActor* actor, const sead::Vector3f& pos, f32 clippingRadius,
|
||||
f32 threshold);
|
||||
bool isResetablePlayerPos(const LiveActor* actor, f32 threshold);
|
||||
void faceToPlayer(LiveActor* actor);
|
||||
} // namespace al
|
||||
|
||||
namespace alPlayerFunction {
|
||||
void registerPlayer(al::LiveActor*, al::PadRumbleKeeper*);
|
||||
bool isFullPlayerHolder(al::LiveActor*);
|
||||
s32 findPlayerHolderIndex(const al::LiveActor*);
|
||||
s32 findPlayerHolderIndex(const al::HitSensor*);
|
||||
bool isPlayerActor(const al::LiveActor*);
|
||||
bool isPlayerActor(const al::HitSensor*);
|
||||
void registerPlayer(al::LiveActor* actor, al::PadRumbleKeeper* padRumbleKeeper);
|
||||
bool isFullPlayerHolder(al::LiveActor* actor);
|
||||
s32 findPlayerHolderIndex(const al::LiveActor* actor);
|
||||
s32 findPlayerHolderIndex(const al::HitSensor* sensor);
|
||||
bool isPlayerActor(const al::LiveActor* actor);
|
||||
bool isPlayerActor(const al::HitSensor* sensor);
|
||||
} // namespace alPlayerFunction
|
||||
|
|
|
|||
|
|
@ -17,16 +17,16 @@ public:
|
|||
class PosVertex;
|
||||
struct VertexInfo;
|
||||
|
||||
Graph(s32 verticesSize, s32 edgesSize);
|
||||
Graph(s32 vertices_size, s32 edges_size);
|
||||
void appendVertex(s32 size);
|
||||
void appendVertex(Vertex* vertex);
|
||||
void removeVertex(const Vertex* vertex);
|
||||
void removeEdge(const Edge* edge);
|
||||
Edge* tryFindEdge(s32 indexVertex1, s32 indexVertex2) const;
|
||||
Edge* tryFindEdge(s32 index_vertex1, s32 index_vertex2) const;
|
||||
void appendEdge(Edge* edge);
|
||||
bool tryAppendEdge(Edge* edge);
|
||||
void appendEdge(s32 indexVertex1, s32 indexVertex2, f32 weight);
|
||||
bool tryAppendEdge(s32 indexVertex1, s32 indexVertex2, f32 weight);
|
||||
void appendEdge(s32 index_vertex1, s32 index_vertex2, f32 weight);
|
||||
bool tryAppendEdge(s32 index_vertex1, s32 index_vertex2, f32 weight);
|
||||
|
||||
s32 getVertexCount() const { return mVertices.size(); }
|
||||
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@ private:
|
|||
void* _0[1];
|
||||
ShadowMaskDirector* mShadowMaskDirector;
|
||||
DepthShadowMapDirector* mDepthShadowMapDirector;
|
||||
void* _10[0x148 / 8];
|
||||
void* _18[0x148 / 8];
|
||||
};
|
||||
|
||||
static_assert(sizeof(ShadowDirector) == 0x160);
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ private:
|
|||
const char* mActorJointName;
|
||||
void* _70[7];
|
||||
sead::FixedSafeString<32> mSetHeightEvenTargetName;
|
||||
s32 _dc[3];
|
||||
s32 _e0[3];
|
||||
};
|
||||
|
||||
static_assert(sizeof(ShadowMaskBase) == 0xf0);
|
||||
|
|
|
|||
|
|
@ -31,7 +31,8 @@ private:
|
|||
|
||||
static_assert(sizeof(AsyncFunctorThread) == 0x20);
|
||||
|
||||
InitializeThread* createAndStartInitializeThread(sead::Heap*, s32, const FunctorBase&);
|
||||
bool tryWaitDoneAndDestroyInitializeThread(InitializeThread*);
|
||||
InitializeThread* createAndStartInitializeThread(sead::Heap* heap, s32 priority,
|
||||
const FunctorBase& functor);
|
||||
bool tryWaitDoneAndDestroyInitializeThread(InitializeThread* thread);
|
||||
sead::CoreId getCurrentCoreId();
|
||||
} // namespace al
|
||||
|
|
|
|||
|
|
@ -122,7 +122,7 @@ public:
|
|||
*getMutableValuePtr<T>() = value;
|
||||
}
|
||||
|
||||
protected:
|
||||
private:
|
||||
template <typename T>
|
||||
bool isEqual_(const ParameterBase& parameter) const;
|
||||
|
||||
|
|
|
|||
|
|
@ -15,8 +15,8 @@ public:
|
|||
|
||||
private:
|
||||
s32 mMatType;
|
||||
void* _18;
|
||||
void* _20;
|
||||
void* _30;
|
||||
void* _38;
|
||||
};
|
||||
|
||||
class AnimPlayerVis : public AnimPlayerSimple {
|
||||
|
|
|
|||
|
|
@ -20,11 +20,11 @@ bool isUpdateListActor(const al::ExecuteOrder& executeOrder);
|
|||
bool isDrawListActor(const al::ExecuteOrder& executeOrder);
|
||||
bool isDrawListActorModel(const al::ExecuteOrder& executeOrder);
|
||||
bool isDrawListLayout(const al::ExecuteOrder& executeOrder);
|
||||
s32 calcExecutorListNumMax(const al::ExecuteOrder* executeOrder, s32 executeDirectorSize,
|
||||
s32 calcExecutorListNumMax(const al::ExecuteOrder* executeOrder, s32 executeOrderSize,
|
||||
const char* listName);
|
||||
s32 calcUpdateListActorNumMax(const al::ExecuteOrder* executeOrder, s32 executeDirectorSize);
|
||||
s32 calcDrawListActorNumMax(const al::ExecuteOrder* executeOrder, s32 executeDirectorSize);
|
||||
s32 calcDrawListActorModelNumMax(const al::ExecuteOrder* executeOrder, s32 executeDirectorSize);
|
||||
s32 calcDrawListLayoutNumMax(const al::ExecuteOrder* executeOrder, s32 executeDirectorSize);
|
||||
s32 calcUpdateListActorNumMax(const al::ExecuteOrder* executeOrder, s32 executeOrderSize);
|
||||
s32 calcDrawListActorNumMax(const al::ExecuteOrder* executeOrder, s32 executeOrderSize);
|
||||
s32 calcDrawListActorModelNumMax(const al::ExecuteOrder* executeOrder, s32 executeOrderSize);
|
||||
s32 calcDrawListLayoutNumMax(const al::ExecuteOrder* executeOrder, s32 executeOrderSize);
|
||||
|
||||
} // namespace alExecutorFunction
|
||||
|
|
|
|||
|
|
@ -163,10 +163,10 @@ void cleanupResGraphicsFile(sead::SafeString& key, Resource* resource) {
|
|||
|
||||
class ResourceAudio {
|
||||
public:
|
||||
ResourceAudio(ResourceSystem::ResourceAudioInfo* info) : audioPlayerInfo(info) {}
|
||||
ResourceAudio(ResourceSystem::ResourceAudioInfo* info) : mAudioPlayerInfo(info) {}
|
||||
|
||||
void disableSoundMemoryPoolHandler(sead::TreeMapImpl<sead::SafeString>::Node* node) {
|
||||
ResourceSystem::ResourceAudioInfo* info = audioPlayerInfo;
|
||||
ResourceSystem::ResourceAudioInfo* info = mAudioPlayerInfo;
|
||||
|
||||
if (node->key().comparen(info->filePath, info->filePath.calcLength()) != 0)
|
||||
return;
|
||||
|
|
@ -183,7 +183,7 @@ public:
|
|||
}
|
||||
|
||||
private:
|
||||
ResourceSystem::ResourceAudioInfo* audioPlayerInfo;
|
||||
ResourceSystem::ResourceAudioInfo* mAudioPlayerInfo;
|
||||
};
|
||||
|
||||
// NON_MATCHING: https://decomp.me/scratch/R5MuA
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ public:
|
|||
|
||||
ResourceSystem(const char* name);
|
||||
|
||||
ResourceCategory* addCategory(const sead::SafeString& name, s32 id, sead::Heap* heap);
|
||||
ResourceCategory* addCategory(const sead::SafeString& name, s32 size, sead::Heap* heap);
|
||||
Resource* findOrCreateResourceCategory(const sead::SafeString& name,
|
||||
const sead::SafeString& category, const char* ext);
|
||||
sead::RingBuffer<ResourceCategory*>::iterator
|
||||
|
|
@ -55,7 +55,7 @@ public:
|
|||
Resource* createResource(const sead::SafeString& name, ResourceCategory* category,
|
||||
const char* ext);
|
||||
void removeCategory(const sead::SafeString& name);
|
||||
Resource* findResource(const sead::SafeString& name);
|
||||
Resource* findResource(const sead::SafeString& categoryName);
|
||||
Resource* findResourceCore(const sead::SafeString& name,
|
||||
sead::RingBuffer<ResourceCategory*>::iterator* outIter);
|
||||
Resource* findOrCreateResource(const sead::SafeString& categoryName, const char* name);
|
||||
|
|
|
|||
|
|
@ -23,8 +23,8 @@ public:
|
|||
bool requestInitSaveDir(const char* fileName, u32 dirSize, u32 version);
|
||||
bool initSaveDirSync(const char* fileName, u32 dirSize, u32 version);
|
||||
// TODO: add parameter names to requestFormat and formatSync
|
||||
bool requestFormat(s32, s32);
|
||||
bool formatSync(s32, s32);
|
||||
bool requestFormat(s32 a, s32 b);
|
||||
bool formatSync(s32 a, s32 b);
|
||||
bool requestRead(const char* fileName, u32 readSize, u32 version);
|
||||
bool readSync(const char* fileName, u32 readSize, u32 version);
|
||||
bool requestWrite(const char* fileName, u32 writeSize, u32 version, bool isFlushNeeded);
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ class SaveDataSequenceFormat : public SaveDataSequenceBase {
|
|||
public:
|
||||
SaveDataSequenceFormat();
|
||||
|
||||
s32 threadFunc(const char* fileName) override;
|
||||
s32 threadFunc(const char* filename) override;
|
||||
|
||||
// TODO: Rename parameters
|
||||
void start(s32 a, s32 b);
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ public:
|
|||
// TODO: Rename parameter
|
||||
SaveDataSequenceInitDir(u8 a);
|
||||
|
||||
s32 threadFunc(const char* fileName) override;
|
||||
s32 threadFunc(const char* filename) override;
|
||||
|
||||
void start(u8* buffer, u32 bufferSize, u32 version);
|
||||
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ class AudioDirector;
|
|||
struct SceneInitInfo {
|
||||
SceneInitInfo(const GameSystemInfo* gameSystemInfo, GameDataHolderBase* gameDataHolder,
|
||||
ScreenCaptureExecutor* screenCaptureExecutor, const char* initStageName,
|
||||
s32 scenarioNo, const char* sceneName, AudioDirector* audioDirector);
|
||||
s32 scenarioNo, const char* initSceneName, AudioDirector* audioDirector);
|
||||
const GameSystemInfo* gameSystemInfo;
|
||||
GameDataHolderBase* gameDataHolder;
|
||||
ScreenCaptureExecutor* screenCaptureExecutor;
|
||||
|
|
|
|||
|
|
@ -38,8 +38,8 @@ public:
|
|||
bool isActiveDemo(const char*);
|
||||
bool isActiveDemoWithPlayer();
|
||||
bool isActiveDemoWithCinemaCaption() const;
|
||||
bool requestStartDemo(const char*, ProjectDemoDirector::DemoType);
|
||||
void requestEndDemo(const char*, ProjectDemoDirector::DemoType);
|
||||
bool requestStartDemo(const char*, DemoType);
|
||||
void requestEndDemo(const char*, DemoType);
|
||||
bool requestStartDemoShineMainGet(Shine*, const char*);
|
||||
void requestEndDemoShineMainGet(const char*);
|
||||
bool requestStartDemoShineGrandGet(Shine*, const char*);
|
||||
|
|
|
|||
|
|
@ -83,13 +83,13 @@ static PlayerHackStartShaderParam gPlayerHackStartShaderParam(true, 200.0f, 10,
|
|||
Bubble::Bubble(const char* name)
|
||||
: al::LiveActor(name), mAnimScaleController(new al::AnimScaleController(&gAnimScaleParam)) {}
|
||||
|
||||
void Bubble::init(const al::ActorInitInfo& initInfo) {
|
||||
void Bubble::init(const al::ActorInitInfo& info) {
|
||||
using BubbleFunctor = al::FunctorV0M<Bubble*, void (Bubble::*)()>;
|
||||
|
||||
al::initActorWithArchiveName(this, initInfo, "Bubble", nullptr);
|
||||
al::initActorWithArchiveName(this, info, "Bubble", nullptr);
|
||||
|
||||
sead::Vector3f moveNext;
|
||||
if (al::tryGetLinksTrans(&moveNext, initInfo, "MoveNext")) {
|
||||
if (al::tryGetLinksTrans(&moveNext, info, "MoveNext")) {
|
||||
mJumpHeight = sead::Mathf::abs(moveNext.y - al::getTrans(this).y);
|
||||
if (moveNext.y < al::getTrans(this).y)
|
||||
al::getTransPtr(this)->set(moveNext);
|
||||
|
|
@ -101,9 +101,9 @@ void Bubble::init(const al::ActorInitInfo& initInfo) {
|
|||
al::setSyncRailToStart(this);
|
||||
mRailTotalLength = al::getRailTotalLength(this);
|
||||
|
||||
if (!al::tryGetArg(&mRailMoveFrame, initInfo, "RailMoveFrame") || mRailMoveFrame < 1) {
|
||||
if (!al::tryGetArg(&mRailMoveFrame, info, "RailMoveFrame") || mRailMoveFrame < 1) {
|
||||
f32 railMoveSpeed = 10.0f;
|
||||
al::tryGetArg(&railMoveSpeed, initInfo, "RailMoveSpeed");
|
||||
al::tryGetArg(&railMoveSpeed, info, "RailMoveSpeed");
|
||||
if (railMoveSpeed <= 0.0f)
|
||||
railMoveSpeed = 10.0f;
|
||||
mRailMoveFrame = sead::Mathf::ceil(mRailTotalLength / railMoveSpeed);
|
||||
|
|
@ -117,15 +117,15 @@ void Bubble::init(const al::ActorInitInfo& initInfo) {
|
|||
mTurnFrameDelay = mJumpHeight / 13.0f;
|
||||
recalcClippingInfo();
|
||||
|
||||
al::tryGetArg(&mWaitFrameNum, initInfo, "WaitFrameNum");
|
||||
al::tryGetArg(&mWaitFrameNum, info, "WaitFrameNum");
|
||||
if (mWaitFrameNum < 0)
|
||||
mWaitFrameNum = 0;
|
||||
|
||||
al::tryGetArg(&mDelayFrameNum, initInfo, "DelayFrameNum");
|
||||
al::tryGetArg(&mDelayFrameNum, info, "DelayFrameNum");
|
||||
if (mDelayFrameNum < 0)
|
||||
mDelayFrameNum = 0;
|
||||
|
||||
al::tryGetArg(&mIsWaveCheckOn, initInfo, "IsWaveCheckOn");
|
||||
al::tryGetArg(&mIsWaveCheckOn, info, "IsWaveCheckOn");
|
||||
mReviveDelayTime = mTurnFrameDelay * 2 + mWaitFrameNum + 80;
|
||||
|
||||
if (al::isExistRail(this)) {
|
||||
|
|
@ -134,7 +134,7 @@ void Bubble::init(const al::ActorInitInfo& initInfo) {
|
|||
}
|
||||
|
||||
f32 shootDegree;
|
||||
al::tryGetArg(&shootDegree, initInfo, "ShootDegree");
|
||||
al::tryGetArg(&shootDegree, info, "ShootDegree");
|
||||
al::initNerve(this, &NrvBubble.StandBy, 1);
|
||||
mBubbleStateInLauncher = new BubbleStateInLauncher(this);
|
||||
al::initNerveState(this, mBubbleStateInLauncher, &NrvBubble.HackInLauncher, "バブルランチャー");
|
||||
|
|
@ -147,10 +147,10 @@ void Bubble::init(const al::ActorInitInfo& initInfo) {
|
|||
mCapTargetInfo = rs::createCapTargetInfo(this, nullptr);
|
||||
|
||||
bool stageStartHack = false;
|
||||
al::tryGetArg(&stageStartHack, initInfo, "StageStartHack");
|
||||
al::tryGetArg(&stageStartHack, info, "StageStartHack");
|
||||
if (!stageStartHack) {
|
||||
al::PlacementInfo placementInfo;
|
||||
if (al::tryGetLinksInfo(&placementInfo, initInfo, "MoveNext"))
|
||||
if (al::tryGetLinksInfo(&placementInfo, info, "MoveNext"))
|
||||
al::tryGetArg(&stageStartHack, placementInfo, "StageStartHack");
|
||||
}
|
||||
|
||||
|
|
@ -178,14 +178,14 @@ void Bubble::init(const al::ActorInitInfo& initInfo) {
|
|||
al::setColliderFilterCollisionParts(this, mCollisionPartsFilter);
|
||||
mClippingProbeActor = new al::LiveActor("グループ同期");
|
||||
|
||||
al::initActorWithArchiveName(mClippingProbeActor, initInfo, "Bubble", "Probe");
|
||||
al::initActorWithArchiveName(mClippingProbeActor, info, "Bubble", "Probe");
|
||||
|
||||
al::setClippingInfo(mClippingProbeActor, al::getClippingRadius(this), &mClippingPos);
|
||||
mClippingProbeActor->makeActorAlive();
|
||||
|
||||
if (al::isExistRail(this) && al::isExistLinkChild(initInfo, "TurnTarget", 0)) {
|
||||
if (al::isExistRail(this) && al::isExistLinkChild(info, "TurnTarget", 0)) {
|
||||
sead::Vector3f trans;
|
||||
al::tryGetLinksQT(&mRailTargetRotation, &trans, initInfo, "TurnTarget");
|
||||
al::tryGetLinksQT(&mRailTargetRotation, &trans, info, "TurnTarget");
|
||||
} else {
|
||||
mRailTargetRotation.set(mStartingRotation);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -78,18 +78,18 @@ public:
|
|||
bool isTriggerHackSwing() const;
|
||||
void faceToMoveVec();
|
||||
bool isTriggerHackJump() const;
|
||||
void revertTargetQuatInHackJump(sead::Quatf* quatA, sead::Quatf* quatB);
|
||||
void revertTargetQuatInHackJump(sead::Quatf* prevQuat, sead::Quatf* deltaQuat);
|
||||
void calcHackerMoveVec(sead::Vector3f* moveVec, const sead::Vector3f& inputDir) const;
|
||||
void makeDisplayQuatInHackJump(const sead::Quatf& quatA, const sead::Quatf& quatB,
|
||||
const sead::Quatf& quatC, bool isValue);
|
||||
void makeDisplayQuatInHackJump(const sead::Quatf& prevQuat, const sead::Quatf& deltaQuat,
|
||||
const sead::Quatf& quatZY, bool flipDirection);
|
||||
bool isDropAttackCollision() const;
|
||||
bool isRiseAttackCollision() const;
|
||||
bool isHoldHackJump() const;
|
||||
bool tryShiftContinuousJump();
|
||||
bool calcHackerMoveDir(sead::Vector3f* moveDir, const sead::Vector3f& inputDir) const;
|
||||
bool isWaitingLaunch() const;
|
||||
void launch(const sead::Vector3f& dir, f32 force, al::CameraTicket* cameraTicket);
|
||||
void launchCancel(const sead::Vector3f& dir);
|
||||
void launch(const sead::Vector3f& targetPos, f32 launchDegree, al::CameraTicket* cameraTicket);
|
||||
void launchCancel(const sead::Vector3f& targetPos);
|
||||
void showHackCap();
|
||||
void hideHackCap();
|
||||
bool isTriggerJump() const;
|
||||
|
|
@ -99,7 +99,8 @@ public:
|
|||
void startJumpAnim(f32 force);
|
||||
void resetAndAppear(const sead::Vector3f& trans, const sead::Quatf& quat, f32 unused);
|
||||
void endHackCommon();
|
||||
void calcLaunchPos(sead::Vector3f* pos, const sead::Vector3f& vecA, f32 valA, f32 valB) const;
|
||||
void calcLaunchPos(sead::Vector3f* pos, const sead::Vector3f& targetPos, f32 launchDegree,
|
||||
f32 frame) const;
|
||||
void onGroupClipping();
|
||||
bool isOnGroundNoVelocity() const;
|
||||
void updateCollisionPartsMove();
|
||||
|
|
|
|||
|
|
@ -28,12 +28,12 @@ public:
|
|||
void registerCoinCollect2D(CoinCollect2D* coin);
|
||||
void registerHintObj(CoinCollectHintObj* hintObj);
|
||||
|
||||
CoinCollect* tryFindAliveCoinCollect(const sead::Vector3f& playerPos, bool checkAreaOb) const;
|
||||
CoinCollect* tryFindAliveCoinCollect(const sead::Vector3f& playerPos, bool checkAreaObj) const;
|
||||
CoinCollect* tryFindAliveCoinCollect(const sead::Vector3f& playerPos, f32 minRange,
|
||||
f32 maxRange, bool checkAreaObj) const;
|
||||
CoinCollect* tryFindDeadButHintEnableCoinCollect() const;
|
||||
CoinCollect2D* tryFindAliveCoinCollect2D(const sead::Vector3f& playerPos,
|
||||
bool checkAreaOb) const;
|
||||
bool checkAreaObj) const;
|
||||
CoinCollect2D* tryFindAliveCoinCollect2D(const sead::Vector3f& playerPos, f32 minRange,
|
||||
f32 maxRange, bool checkAreaObj) const;
|
||||
bool tryFindExStageHintObjTrans(sead::Vector3f* outTrans, const char* stageName);
|
||||
|
|
|
|||
|
|
@ -39,8 +39,8 @@ CoinStackBound::CoinStackBound(const char* name) : al::LiveActor(name) {
|
|||
mBounceMtxEffect.makeIdentity();
|
||||
}
|
||||
|
||||
void CoinStackBound::init(const al::ActorInitInfo& initInfo) {
|
||||
al::initActorWithArchiveName(this, initInfo, "CoinStackBound", nullptr);
|
||||
void CoinStackBound::init(const al::ActorInitInfo& info) {
|
||||
al::initActorWithArchiveName(this, info, "CoinStackBound", nullptr);
|
||||
al::initJointControllerKeeper(this, 1);
|
||||
mQuat.set(1.0f, 0.0f, 0.0f, 0.0f);
|
||||
al::initJointGlobalQuatController(this, &mQuat, "AllRoot");
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ class CoinStackBound : public al::LiveActor {
|
|||
public:
|
||||
CoinStackBound(const char* name);
|
||||
|
||||
void init(const al::ActorInitInfo& initInfo) override;
|
||||
void init(const al::ActorInitInfo& info) override;
|
||||
bool receiveMsg(const al::SensorMsg* message, al::HitSensor* other,
|
||||
al::HitSensor* self) override;
|
||||
void appear() override;
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ void setKidsModeLayoutEnable(const al::IUseSceneObjHolder* user) {
|
|||
}
|
||||
|
||||
bool isKidsModeLayoutDisable(const al::IUseSceneObjHolder* user) {
|
||||
return !rs::isKidsMode(user) ||
|
||||
return !isKidsMode(user) ||
|
||||
al::getSceneObj<KidsModeLayoutAccessor>(user)->isKidsModeLayoutDisable();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ class PropellerRotateInfo;
|
|||
class KoopaShip : public al::LiveActor {
|
||||
public:
|
||||
KoopaShip(const char*);
|
||||
void init(const al::ActorInitInfo&) override;
|
||||
void init(const al::ActorInitInfo& info) override;
|
||||
void onSwitchGateKeeperOpeningDemoStart();
|
||||
void onBlurMovie();
|
||||
void initAfterPlacement() override;
|
||||
|
|
|
|||
|
|
@ -32,21 +32,20 @@ NERVES_MAKE_STRUCT(PoleGrabCeil, Wait, Grab, GrabEnd);
|
|||
|
||||
PoleGrabCeil::PoleGrabCeil(const char* name) : al::LiveActor(name) {}
|
||||
|
||||
void PoleGrabCeil::init(const al::ActorInitInfo& initInfo) {
|
||||
if (al::isObjectName(initInfo, "PoleGrabCeilKeyMoveParts")) {
|
||||
al::initActorWithArchiveName(this, initInfo, "PoleGrabCeilKeyMoveParts", "KeyMoveParts");
|
||||
void PoleGrabCeil::init(const al::ActorInitInfo& info) {
|
||||
if (al::isObjectName(info, "PoleGrabCeilKeyMoveParts")) {
|
||||
al::initActorWithArchiveName(this, info, "PoleGrabCeilKeyMoveParts", "KeyMoveParts");
|
||||
mKeyMoveFollowTarget = new al::KeyMoveFollowTarget("ぶらさがり棒[キームーブ移動]本体");
|
||||
mKeyMoveFollowTarget->initKeyMoveFollowTarget(initInfo, "PoleGrabCeilKeyMoveParts",
|
||||
nullptr);
|
||||
al::initSubActorKeeperNoFile(this, initInfo, 1);
|
||||
mKeyMoveFollowTarget->initKeyMoveFollowTarget(info, "PoleGrabCeilKeyMoveParts", nullptr);
|
||||
al::initSubActorKeeperNoFile(this, info, 1);
|
||||
al::registerSubActor(this, mKeyMoveFollowTarget);
|
||||
al::tryGetArg(&mIsCollisionCheck, initInfo, "IsCollisionCheck");
|
||||
al::tryGetArg(&mIsCollisionCheck, info, "IsCollisionCheck");
|
||||
mSurfaceMatrix.makeIdentity();
|
||||
al::setEffectNamedMtxPtr(mKeyMoveFollowTarget, "Surface", &mSurfaceMatrix);
|
||||
} else {
|
||||
al::initActorWithArchiveName(this, initInfo, "PoleGrabCeil", nullptr);
|
||||
mMtxConnector = al::tryCreateMtxConnector(this, initInfo);
|
||||
mIsConnectPose = al::tryGetBoolArgOrFalse(initInfo, "IsConnectPose");
|
||||
al::initActorWithArchiveName(this, info, "PoleGrabCeil", nullptr);
|
||||
mMtxConnector = al::tryCreateMtxConnector(this, info);
|
||||
mIsConnectPose = al::tryGetBoolArgOrFalse(info, "IsConnectPose");
|
||||
}
|
||||
|
||||
al::initNerve(this, &NrvPoleGrabCeil.Wait, 0);
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ class SensorMsg;
|
|||
class PoleGrabCeil : public al::LiveActor {
|
||||
public:
|
||||
PoleGrabCeil(const char* name);
|
||||
void init(const al::ActorInitInfo& initInfo) override;
|
||||
void init(const al::ActorInitInfo& info) override;
|
||||
void initAfterPlacement() override;
|
||||
void control() override;
|
||||
void exeWait();
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ class ShineTowerRocket : public al::LiveActor,
|
|||
public IUseDemoSkip {
|
||||
public:
|
||||
ShineTowerRocket(const char*);
|
||||
void init(const al::ActorInitInfo&) override;
|
||||
void init(const al::ActorInitInfo& info) override;
|
||||
void onSwitchDither();
|
||||
void offSwitchDither();
|
||||
void makeActorDead() override;
|
||||
|
|
@ -40,7 +40,7 @@ public:
|
|||
bool receiveMsg(const al::SensorMsg* message, al::HitSensor* other,
|
||||
al::HitSensor* self) override;
|
||||
void attackSensor(al::HitSensor* self, al::HitSensor* other) override;
|
||||
bool receiveEvent(const al::EventFlowEventData*) override;
|
||||
bool receiveEvent(const al::EventFlowEventData* event) override;
|
||||
void tryStartEntranceCamera(s32);
|
||||
bool isFirstDemo() const override;
|
||||
bool isEnableSkipDemo() const override;
|
||||
|
|
|
|||
|
|
@ -133,7 +133,7 @@ void Souvenir::exeWait() {
|
|||
al::isActionPlaying(this, "ReactionCap3")) ||
|
||||
(al::isExistAction(this, "ReactionCap4") &&
|
||||
al::isActionPlaying(this, "ReactionCap4"))) &&
|
||||
getNextAction(this) != nullptr)
|
||||
getNextAction(this))
|
||||
return;
|
||||
|
||||
if (mIsWait) {
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ class IUsePlayerPuppet;
|
|||
class WorldWarpHole : public al::LiveActor {
|
||||
public:
|
||||
WorldWarpHole(const char*);
|
||||
void init(const al::ActorInitInfo&) override;
|
||||
void init(const al::ActorInitInfo& info) override;
|
||||
void initAfterPlacement() override;
|
||||
bool receiveMsg(const al::SensorMsg* message, al::HitSensor* other,
|
||||
al::HitSensor* self) override;
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ public:
|
|||
void initAttach(const al::LiveActor*);
|
||||
void makeActorAlive() override;
|
||||
void control() override;
|
||||
void init(const al::ActorInitInfo&) override;
|
||||
void init(const al::ActorInitInfo& info) override;
|
||||
|
||||
private:
|
||||
const char* _108;
|
||||
|
|
|
|||
|
|
@ -69,55 +69,55 @@ static const NpcEventStateScareActionParam gStateScare("ScaredStart", "Scared",
|
|||
|
||||
VolleyballNpc::VolleyballNpc(const char* name) : al::LiveActor(name) {}
|
||||
|
||||
void VolleyballNpc::init(const al::ActorInitInfo& initInfo) {
|
||||
al::initActorWithArchiveName(this, initInfo, "SeaMan", "Volleyball");
|
||||
void VolleyballNpc::init(const al::ActorInitInfo& info) {
|
||||
al::initActorWithArchiveName(this, info, "SeaMan", "Volleyball");
|
||||
al::startMtpAnim(this, "Body1");
|
||||
TalkNpcCap::createForVolleyballNpc(this, initInfo);
|
||||
mEventFlowExecutor = rs::initEventFlowSuffix(this, initInfo, "Volleyball", nullptr, nullptr);
|
||||
TalkNpcCap::createForVolleyballNpc(this, info);
|
||||
mEventFlowExecutor = rs::initEventFlowSuffix(this, info, "Volleyball", nullptr, nullptr);
|
||||
al::MessageTagDataHolder* messageHolder = al::initMessageTagDataHolder(1);
|
||||
al::registerMessageTagDataScore(messageHolder, "Score", &mCurrentScore);
|
||||
rs::initEventMessageTagDataHolder(mEventFlowExecutor, messageHolder);
|
||||
mBestScore = rs::getVolleyballBestCount(this);
|
||||
mDayScore = rs::getVolleyballDayCount(this);
|
||||
mShineClear = rs::tryInitLinkShine(initInfo, "ShineActor", 0);
|
||||
mShineSuperClear = rs::tryInitLinkShine(initInfo, "ShineActor", 1);
|
||||
mShineClear = rs::tryInitLinkShine(info, "ShineActor", 0);
|
||||
mShineSuperClear = rs::tryInitLinkShine(info, "ShineActor", 1);
|
||||
|
||||
al::AreaObjGroup* gameAreaGroup = al::createLinkAreaGroup(
|
||||
this, initInfo, "VolleyballArea", "バレー開始エリア", "バレー開始エリア");
|
||||
this, info, "VolleyballArea", "バレー開始エリア", "バレー開始エリア");
|
||||
if (gameAreaGroup && gameAreaGroup->getSize() == 1)
|
||||
mGameArea = gameAreaGroup->getAreaObj(0);
|
||||
else
|
||||
makeActorDead();
|
||||
|
||||
al::AreaObjGroup* ballAreaGroup =
|
||||
al::createLinkAreaGroup(this, initInfo, "BallArea", "ボール範囲", "ボール範囲");
|
||||
al::createLinkAreaGroup(this, info, "BallArea", "ボール範囲", "ボール範囲");
|
||||
if (ballAreaGroup && ballAreaGroup->getSize() == 1)
|
||||
mBallArea = ballAreaGroup->getAreaObj(0);
|
||||
else
|
||||
makeActorDead();
|
||||
|
||||
al::AreaObjGroup* layoutAreaGroup =
|
||||
al::createLinkAreaGroup(this, initInfo, "LayoutArea", "レイアウト範囲", "レイアウト範囲");
|
||||
al::createLinkAreaGroup(this, info, "LayoutArea", "レイアウト範囲", "レイアウト範囲");
|
||||
if (layoutAreaGroup && layoutAreaGroup->getSize() == 1)
|
||||
mLayoutArea = layoutAreaGroup->getAreaObj(0);
|
||||
else
|
||||
makeActorDead();
|
||||
|
||||
al::getArg(&mLevelUpCount, initInfo, "LevelUpCount");
|
||||
al::getArg(&mLevelUpSpeed, initInfo, "LevelUpSpeed");
|
||||
al::getArg(&mMaxSpeed, initInfo, "MaxSpeed");
|
||||
al::getArg(&mInitSpeed, initInfo, "InitSpeed");
|
||||
al::getArg(&mBallNumMax, initInfo, "BallNumMax");
|
||||
al::getArg(&mLevelUpBallCount, initInfo, "LevelUpBallCount");
|
||||
al::getArg(&mClearCount, initInfo, "ClearCount");
|
||||
al::getArg(&mSuperClearCount, initInfo, "SuperClearCount");
|
||||
al::getArg(&mLevelUpCount, info, "LevelUpCount");
|
||||
al::getArg(&mLevelUpSpeed, info, "LevelUpSpeed");
|
||||
al::getArg(&mMaxSpeed, info, "MaxSpeed");
|
||||
al::getArg(&mInitSpeed, info, "InitSpeed");
|
||||
al::getArg(&mBallNumMax, info, "BallNumMax");
|
||||
al::getArg(&mLevelUpBallCount, info, "LevelUpBallCount");
|
||||
al::getArg(&mClearCount, info, "ClearCount");
|
||||
al::getArg(&mSuperClearCount, info, "SuperClearCount");
|
||||
|
||||
al::DeriveActorGroup<VolleyballBall>* ballGroup =
|
||||
new al::DeriveActorGroup<VolleyballBall>("バレーボールのボール", mBallNumMax);
|
||||
mBallGroup = ballGroup;
|
||||
for (s32 i = 0; i < ballGroup->getMaxActorCount(); i++) {
|
||||
VolleyballBall* ball = new VolleyballBall("バレーボールのボール");
|
||||
al::initCreateActorNoPlacementInfo(ball, initInfo);
|
||||
al::initCreateActorNoPlacementInfo(ball, info);
|
||||
ballGroup->registerActor(ball);
|
||||
}
|
||||
|
||||
|
|
@ -128,9 +128,9 @@ void VolleyballNpc::init(const al::ActorInitInfo& initInfo) {
|
|||
}
|
||||
|
||||
mBase = new VolleyballBase("土台");
|
||||
al::initLinksActor(mBase, initInfo, "Base", 0);
|
||||
al::initLinksActor(mBase, info, "Base", 0);
|
||||
|
||||
mLayout = new VolleyballLayout(this, initInfo);
|
||||
mLayout = new VolleyballLayout(this, info);
|
||||
|
||||
al::calcFrontDir(&mFrontDir, this);
|
||||
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ public:
|
|||
void endGame();
|
||||
bool receiveEvent(const al::EventFlowEventData* event) override;
|
||||
void attackSensor(al::HitSensor* self, al::HitSensor* other) override;
|
||||
void startGame(bool startEvent);
|
||||
void startGame(bool startEventFlow);
|
||||
bool receiveMsg(const al::SensorMsg* message, al::HitSensor* other,
|
||||
al::HitSensor* self) override;
|
||||
void addSuccessCount();
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ public:
|
|||
const PlayerJointControlKeeper*, HackCapJudgePreInputSeparateThrow*,
|
||||
HackCapJudgePreInputSeparateJump*);
|
||||
|
||||
void init(const al::ActorInitInfo&) override;
|
||||
void init(const al::ActorInitInfo& info) override;
|
||||
void hide(bool);
|
||||
void movement() override;
|
||||
void updateShadowMaskOffset();
|
||||
|
|
|
|||
|
|
@ -42,9 +42,11 @@ public:
|
|||
bool isTriggerHipDrop() const;
|
||||
bool isTriggerHeadSliding() const;
|
||||
bool isTriggerPaddle() const;
|
||||
bool isTriggerRolling(bool) const;
|
||||
// TODO: proper parameter name
|
||||
bool isTriggerRolling(bool a1) const;
|
||||
bool isTriggerRollingRestartSwing() const;
|
||||
bool isTriggerRollingCancelHipDrop(bool) const;
|
||||
// TODO: proper parameter name
|
||||
bool isTriggerRollingCancelHipDrop(bool a1) const;
|
||||
bool isTriggerHackAction() const;
|
||||
bool isTriggerHackJump() const;
|
||||
bool isTriggerHackSwing() const;
|
||||
|
|
@ -72,7 +74,8 @@ public:
|
|||
bool isTriggerCapSeparateHipDrop() const;
|
||||
bool isTriggerSwingPoleClimbFast() const;
|
||||
bool isHoldPoleClimbDown() const;
|
||||
bool isTriggerAppendCapAttack(bool) const;
|
||||
// TODO: proper parameter name
|
||||
bool isTriggerAppendCapAttack(bool a1) const;
|
||||
bool isHoldSquat() const;
|
||||
void calcInputDirectionSnap2D(sead::Vector3f*) const;
|
||||
bool isHoldSpinCap() const;
|
||||
|
|
@ -120,8 +123,10 @@ public:
|
|||
bool isSwingDirLeft() const;
|
||||
bool isSwingDirRight() const;
|
||||
bool isThrowTypeLeftRight(const sead::Vector2f&) const;
|
||||
bool isThrowTypeSpiral(const sead::Vector2f&) const;
|
||||
bool isThrowTypeRolling(const sead::Vector2f&) const;
|
||||
// TODO: proper parameter name
|
||||
bool isThrowTypeSpiral(const sead::Vector2f& a1) const;
|
||||
// TODO: proper parameter name
|
||||
bool isThrowTypeRolling(const sead::Vector2f& a1) const;
|
||||
bool isEnableConsiderCapThrowDoubleSwing() const;
|
||||
f32 getPoseRotZDegreeLeft() const;
|
||||
f32 getPoseRotZDegreeRight() const;
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ class PlayerInput;
|
|||
class PlayerStateCameraSubjective : public al::ActorStateBase {
|
||||
public:
|
||||
PlayerStateCameraSubjective(al::LiveActor* player, al::CameraTicket* cameraTicket,
|
||||
IPlayerModelChanger* modelChanger, PlayerCarryKeeper* carrykeeper,
|
||||
IPlayerModelChanger* modelChanger, PlayerCarryKeeper* carryKeeper,
|
||||
PlayerAnimator* animator, const PlayerConst* playerConst,
|
||||
const IUsePlayerCollision* collider, const PlayerInput* input);
|
||||
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ class HackCap;
|
|||
|
||||
class PlayerStateHack : public al::ActorStateBase {
|
||||
public:
|
||||
PlayerStateHack(al::LiveActor* parent, PlayerHackKeeper* hackKeeper,
|
||||
PlayerStateHack(al::LiveActor* player, PlayerHackKeeper* hackKeeper,
|
||||
IPlayerModelChanger* modelChanger, PlayerAnimator* animator, HackCap* hackCap);
|
||||
|
||||
void appear() override;
|
||||
|
|
|
|||
|
|
@ -41,24 +41,24 @@ FirstSequenceScene::~FirstSequenceScene() {
|
|||
Application::instance()->getGameFramework()->enableClearRenderBuffer();
|
||||
}
|
||||
|
||||
void FirstSequenceScene::init(const al::SceneInitInfo& initInfo) {
|
||||
initDrawSystemInfo(initInfo);
|
||||
void FirstSequenceScene::init(const al::SceneInitInfo& info) {
|
||||
initDrawSystemInfo(info);
|
||||
|
||||
initSceneObjHolder(SceneObjFactory::createSceneObjHolder());
|
||||
al::setSceneObj(this, GameDataFunction::getGameDataHolder(initInfo.gameDataHolder),
|
||||
al::setSceneObj(this, GameDataFunction::getGameDataHolder(info.gameDataHolder),
|
||||
SceneObjID_GameDataHolder);
|
||||
|
||||
initSceneStopCtrl();
|
||||
|
||||
al::AudioDirectorInitInfo audioDirectorInitInfo;
|
||||
al::initAudioDirector2D(this, initInfo, audioDirectorInitInfo);
|
||||
alAudioSystemFunction::disableAudioMaximizer(initInfo.gameSystemInfo);
|
||||
al::initSceneAudioKeeper(this, initInfo, nullptr);
|
||||
al::initAudioDirector2D(this, info, audioDirectorInitInfo);
|
||||
alAudioSystemFunction::disableAudioMaximizer(info.gameSystemInfo);
|
||||
al::initSceneAudioKeeper(this, info, nullptr);
|
||||
|
||||
initLayoutKit(initInfo);
|
||||
initLayoutKit(info);
|
||||
getLayoutKit()->createExecuteDirector(0x80);
|
||||
al::LayoutInitInfo layoutInitInfo;
|
||||
al::initLayoutInitInfo(&layoutInitInfo, this, initInfo);
|
||||
al::initLayoutInitInfo(&layoutInitInfo, this, info);
|
||||
|
||||
mBootLayout = new BootLayout(layoutInitInfo);
|
||||
mBootLayout->appear();
|
||||
|
|
@ -66,7 +66,7 @@ void FirstSequenceScene::init(const al::SceneInitInfo& initInfo) {
|
|||
|
||||
initNerve(&Wipe, 1);
|
||||
|
||||
mWaveVibrationHolder = initInfo.gameSystemInfo->waveVibrationHolder;
|
||||
mWaveVibrationHolder = info.gameSystemInfo->waveVibrationHolder;
|
||||
|
||||
mStateSelectMode = new SceneStateSelectMode("モード選択", this, layoutInitInfo, nullptr,
|
||||
nullptr, mWaveVibrationHolder);
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ public:
|
|||
FirstSequenceScene();
|
||||
~FirstSequenceScene();
|
||||
|
||||
void init(const al::SceneInitInfo& initInfo) override;
|
||||
void init(const al::SceneInitInfo& info) override;
|
||||
void appear() override;
|
||||
void control() override;
|
||||
void drawMain() const override;
|
||||
|
|
|
|||
|
|
@ -86,7 +86,7 @@ public:
|
|||
StageScene();
|
||||
~StageScene() override;
|
||||
|
||||
void init(const al::SceneInitInfo& sceneInitInfo) override;
|
||||
void init(const al::SceneInitInfo& info) override;
|
||||
void stopCollectBgm();
|
||||
bool tryChangeDemo();
|
||||
void appear() override;
|
||||
|
|
|
|||
|
|
@ -10,33 +10,33 @@
|
|||
|
||||
// NON_MATCHING: https://decomp.me/scratch/jv20V
|
||||
void GameDataFile::HintInfo::clear() {
|
||||
mStageName.clear();
|
||||
mObjId.clear();
|
||||
stageName.clear();
|
||||
objId.clear();
|
||||
// mScenarioName.clear();
|
||||
mObjectName = nullptr;
|
||||
mTrans = sead::Vector3f::zero;
|
||||
mTransAgain = sead::Vector3f::zero;
|
||||
mMainScenarioNo = -1;
|
||||
mWorldIndex = -1;
|
||||
mUniqueID = -1;
|
||||
mIsMoonRock = false;
|
||||
objectName = nullptr;
|
||||
trans = sead::Vector3f::zero;
|
||||
transAgain = sead::Vector3f::zero;
|
||||
mainScenarioNo = -1;
|
||||
worldIndex = -1;
|
||||
uniqueID = -1;
|
||||
isMoonRock = false;
|
||||
unkBool1 = false;
|
||||
unkPtr6 = nullptr;
|
||||
mHintStatus = HintStatus::None;
|
||||
mIsAchievement = false;
|
||||
mIsGrand = false;
|
||||
mAchievementStatus = AchievementStatus::None;
|
||||
mIsShopMoon = false;
|
||||
mHintIdx = 0;
|
||||
hintStatus = HintStatus::None;
|
||||
isAchievement = false;
|
||||
isGrand = false;
|
||||
achievementStatus = AchievementStatus::None;
|
||||
isShopMoon = false;
|
||||
hintIdx = 0;
|
||||
|
||||
mOptionalID.clear();
|
||||
mProgressBitflag = 0;
|
||||
mIsDisabled = false;
|
||||
optionalID.clear();
|
||||
progressBitflag = 0;
|
||||
isDisabled = false;
|
||||
unkBool3 = 0;
|
||||
}
|
||||
|
||||
bool GameDataFile::HintInfo::isDisableByWorldWarpHole(bool condition) const {
|
||||
if (!condition && al::isEqualString(mOptionalID.cstr(), "WorldWarpHoleShine"))
|
||||
if (!condition && al::isEqualString(optionalID.cstr(), "WorldWarpHoleShine"))
|
||||
return true;
|
||||
return false;
|
||||
}
|
||||
|
|
@ -47,12 +47,12 @@ bool GameDataFile::HintInfo::isEnableUnlock(s32 curWorldId, bool isGameClear, s3
|
|||
if (unkBool1)
|
||||
return false;
|
||||
|
||||
if (mHintStatus == HintStatus::None)
|
||||
if (hintStatus == HintStatus::None)
|
||||
return true;
|
||||
|
||||
if (isGameClear && mIsMoonRock)
|
||||
if (isGameClear && isMoonRock)
|
||||
return false;
|
||||
else if (!isGameClear && mIsMoonRock)
|
||||
else if (!isGameClear && isMoonRock)
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
@ -61,29 +61,29 @@ bool GameDataFile::HintInfo::isEnableUnlock(s32 curWorldId, bool isGameClear, s3
|
|||
|
||||
bool GameDataFile::HintInfo::isHintStatusUnlock(s32 curWorldId, s32 scenarioNo,
|
||||
bool isInWorld) const {
|
||||
if (mWorldIndex != curWorldId || unkBool1 || mHintStatus != HintStatus::None ||
|
||||
(isInWorld ? !mIsMoonRock : mIsMoonRock))
|
||||
if (worldIndex != curWorldId || unkBool1 || hintStatus != HintStatus::None ||
|
||||
(isInWorld ? !isMoonRock : isMoonRock))
|
||||
return false;
|
||||
|
||||
return !GameDataFunction::isCityWorldCeremonyAll(curWorldId, scenarioNo) || unkBool3;
|
||||
}
|
||||
|
||||
bool GameDataFile::HintInfo::isHintStatusUnlockByNpc() const {
|
||||
return mHintStatus == HintStatus::Npc && !mIsMoonRock;
|
||||
return hintStatus == HintStatus::Npc && !isMoonRock;
|
||||
}
|
||||
|
||||
bool GameDataFile::HintInfo::isHintStatusUnlockByAmiibo() const {
|
||||
return mHintStatus == HintStatus::Amiibo;
|
||||
return hintStatus == HintStatus::Amiibo;
|
||||
}
|
||||
|
||||
bool GameDataFile::HintInfo::isEnableNameUnlockByScenario(s32 curWorldId, s32 scenarioNo,
|
||||
bool isInWorld) const {
|
||||
if (isDisableByWorldWarpHole(isInWorld))
|
||||
return false;
|
||||
if (mWorldIndex != curWorldId || mIsDisabled)
|
||||
if (worldIndex != curWorldId || isDisabled)
|
||||
return false;
|
||||
if (mProgressBitflag.countOnBit())
|
||||
return mProgressBitflag.isOnBit(scenarioNo - 1);
|
||||
if (progressBitflag.countOnBit())
|
||||
return progressBitflag.isOnBit(scenarioNo - 1);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
@ -91,18 +91,17 @@ bool GameDataFile::HintInfo::testFunc(s32 curWorldId, bool isGameClear, s32 scen
|
|||
bool isInWorld) const {
|
||||
if (isDisableByWorldWarpHole(isInWorld))
|
||||
return false;
|
||||
if (mWorldIndex != curWorldId || mIsDisabled || isGameClear)
|
||||
if (worldIndex != curWorldId || isDisabled || isGameClear)
|
||||
return false;
|
||||
if (mProgressBitflag.countOnBit())
|
||||
return mProgressBitflag.isOnBit(scenarioNo - 1);
|
||||
if (progressBitflag.countOnBit())
|
||||
return progressBitflag.isOnBit(scenarioNo - 1);
|
||||
return true;
|
||||
}
|
||||
|
||||
void GameDataFile::unlockAchievementShineName() {
|
||||
for (s32 i = 0; i < mHintList.size(); i++)
|
||||
if (mHintList[i].mAchievementStatus == AchievementStatus::None &&
|
||||
mHintList[i].mIsAchievement)
|
||||
mHintList[i].mAchievementStatus = AchievementStatus::Unlocked;
|
||||
if (mHintList[i].achievementStatus == AchievementStatus::None && mHintList[i].isAchievement)
|
||||
mHintList[i].achievementStatus = AchievementStatus::Unlocked;
|
||||
mIsUnlockAchievement = true;
|
||||
}
|
||||
|
||||
|
|
@ -297,7 +296,7 @@ void GameDataFile::wearCap(const char* name) {
|
|||
|
||||
void GameDataFile::enableHintById(s32 shineIndex) {
|
||||
if (shineIndex >= 0)
|
||||
mHintList[shineIndex].mIsDisabled = false;
|
||||
mHintList[shineIndex].isDisabled = false;
|
||||
}
|
||||
|
||||
inline s32 GameDataFile::getCurrentWorldIdNoDevelop() const {
|
||||
|
|
|
|||
|
|
@ -68,33 +68,33 @@ public:
|
|||
|
||||
bool testFunc(s32 curWorldId, bool isGameClear, s32 scenarioNo, bool isInWorld) const;
|
||||
|
||||
sead::FixedSafeString<0x80> mStageName;
|
||||
sead::FixedSafeString<0x80> mObjId;
|
||||
sead::FixedSafeString<0x40> mScenarioName;
|
||||
const char* mObjectName;
|
||||
sead::Vector3f mTrans;
|
||||
sead::Vector3f mTransAgain;
|
||||
sead::FixedSafeString<0x80> stageName;
|
||||
sead::FixedSafeString<0x80> objId;
|
||||
sead::FixedSafeString<0x40> scenarioName;
|
||||
const char* objectName;
|
||||
sead::Vector3f trans;
|
||||
sead::Vector3f transAgain;
|
||||
void* unkPtr1;
|
||||
void* unkPtr2;
|
||||
void* unkPtr3;
|
||||
void* unkPtr4;
|
||||
s32 mMainScenarioNo;
|
||||
s32 mWorldIndex;
|
||||
bool mIsMoonRock;
|
||||
s32 mainScenarioNo;
|
||||
s32 worldIndex;
|
||||
bool isMoonRock;
|
||||
bool unkBool1;
|
||||
bool mIsAchievement;
|
||||
bool mIsGrand;
|
||||
bool mIsShopMoon;
|
||||
bool isAchievement;
|
||||
bool isGrand;
|
||||
bool isShopMoon;
|
||||
s32 unkInt;
|
||||
HintStatus mHintStatus;
|
||||
AchievementStatus mAchievementStatus;
|
||||
HintStatus hintStatus;
|
||||
AchievementStatus achievementStatus;
|
||||
s32 unkInt4;
|
||||
void* unkPtr6;
|
||||
s32 mUniqueID;
|
||||
s32 mHintIdx;
|
||||
sead::FixedSafeString<0x20> mOptionalID;
|
||||
sead::BitFlag32 mProgressBitflag;
|
||||
bool mIsDisabled;
|
||||
s32 uniqueID;
|
||||
s32 hintIdx;
|
||||
sead::FixedSafeString<0x20> optionalID;
|
||||
sead::BitFlag32 progressBitflag;
|
||||
bool isDisabled;
|
||||
bool unkBool3;
|
||||
};
|
||||
|
||||
|
|
@ -475,19 +475,19 @@ public:
|
|||
sead::FixedSafeString<64>* getGiftName() { return mGiftNamePtr; }
|
||||
|
||||
private:
|
||||
char _000[0x18];
|
||||
char _0[0x18];
|
||||
FixedHeapArray<s32, sNumWorlds> mShopShineNum;
|
||||
FixedHeapArray<s32, sNumWorlds> mMainScenarioNo;
|
||||
s32 mStartShineIndex;
|
||||
char _02c[0x98];
|
||||
char _2c[0x98];
|
||||
sead::FixedSafeString<128> mPlayerStartIdForSave;
|
||||
char _15c[0x30];
|
||||
char _160[0x30];
|
||||
WorldList* mWorldList;
|
||||
char _198[0x60];
|
||||
sead::FixedSafeString<128> mCheckpointName;
|
||||
char _28c[0x98];
|
||||
char _290[0x98];
|
||||
sead::FixedSafeString<128> mCurrentStageName;
|
||||
char _3bc[0xa0];
|
||||
char _3c0[0xa0];
|
||||
FixedHeapArray<bool, sNumWorlds> mIsWorldWarpHoleThrough;
|
||||
sead::DateTime mSaveTimeForDisp;
|
||||
sead::DateTime mSaveTime;
|
||||
|
|
@ -571,7 +571,7 @@ private:
|
|||
char _858[0x8];
|
||||
PlayerHitPointData* mPlayerHitPointData;
|
||||
sead::BufferedSafeString mNextStageName;
|
||||
char _884[0x11c];
|
||||
char _880[0x11c];
|
||||
FixedHeapArray<HintInfo, 1024> mHintList;
|
||||
char _9a8[0x48];
|
||||
s32 mCurrentWorldId;
|
||||
|
|
|
|||
|
|
@ -160,7 +160,7 @@ bool checkGetShineForWorldTravelingPeach(GameDataHolderAccessor accessor, const
|
|||
bool checkEnableAppearMoonWorldTravelingPeach(const al::LiveActor* actor);
|
||||
bool isStartWorldTravelingPeach(const al::LiveActor* actor);
|
||||
void startWorldTravelingPeach(const al::LiveActor* actor);
|
||||
bool checkGetEnoughShine(const al::LiveActor* actor, s32 count);
|
||||
bool checkGetEnoughShine(const al::LiveActor* actor, s32 worldId);
|
||||
bool checkGetEnoughShineInCurrentWorld(const al::LiveActor* actor);
|
||||
void setFlagOnStartKoopaCapture(const al::LiveActor* actor);
|
||||
bool isStartKoopaCapture(const al::LiveActor* actor);
|
||||
|
|
@ -190,8 +190,8 @@ bool isInNormalCoinShopFirst(const al::LiveActor* actor);
|
|||
void offInNormalCoinShopFirst(const al::LiveActor* actor);
|
||||
bool checkExistNewShopItem(const al::LiveActor* actor, s32 unk1, s32 unk2, bool unk3);
|
||||
CapMessageBossData* getCapMessageBossData(const al::LiveActor* actor);
|
||||
void getYoshiFruit(SaveObjInfo* saveObjInfo);
|
||||
bool isGetYoshiFruit(const SaveObjInfo* saveObjInfo);
|
||||
void getYoshiFruit(SaveObjInfo* yoshiFruit);
|
||||
bool isGetYoshiFruit(const SaveObjInfo* yoshiFruit);
|
||||
bool isTalkKakku(const al::LiveActor* actor);
|
||||
void talkKakku(const al::LiveActor* actor);
|
||||
bool isTalkWorldTravelingPeach(const al::LiveActor* actor);
|
||||
|
|
@ -201,7 +201,7 @@ void talkCollectBgmNpc(const al::LiveActor* actor);
|
|||
s32 getTokimekiMayorNpcFavorabilityRating(const al::LiveActor* actor);
|
||||
void setTokimekiMayorNpcFavorabilityRating(const al::LiveActor* actor, s32 rating);
|
||||
bool tryFindCoinStackSave(s32* out, const al::LiveActor* actor, const al::PlacementId* placement);
|
||||
void saveCoinStack(const al::LiveActor* actor, const al::PlacementId* placement, s32 value);
|
||||
void saveCoinStack(const al::LiveActor* actor, const al::PlacementId* placementId, s32 value);
|
||||
bool isCollectedBgmCityWorldCelemony(const al::LiveActor* actor);
|
||||
bool isCollectedBgmCityWorldCelemony2D(const al::LiveActor* actor);
|
||||
s32 calcGetShineNumCollectedBgm(GameDataHolderAccessor accessor);
|
||||
|
|
|
|||
|
|
@ -17,8 +17,8 @@ public:
|
|||
void init();
|
||||
void saveHintPhoto(const char*);
|
||||
bool checkSavedHintPhoto(const char*) const;
|
||||
void write(al::ByamlWriter*) override;
|
||||
void read(const al::ByamlIter&) override;
|
||||
void write(al::ByamlWriter* writer) override;
|
||||
void read(const al::ByamlIter& save) override;
|
||||
|
||||
private:
|
||||
GameDataFile* mGameDataFile;
|
||||
|
|
|
|||
|
|
@ -17,8 +17,8 @@ public:
|
|||
bool isNeedUpload(const RankingCategory&) const;
|
||||
void upload(const RankingCategory&);
|
||||
void updateScore(const RankingCategory&);
|
||||
void write(al::ByamlWriter*) override;
|
||||
void read(const al::ByamlIter&) override;
|
||||
void write(al::ByamlWriter* writer) override;
|
||||
void read(const al::ByamlIter& save) override;
|
||||
|
||||
struct Entry {
|
||||
bool isNeedUpload;
|
||||
|
|
|
|||
|
|
@ -23,8 +23,8 @@ public:
|
|||
bool isEnableExplainShopCoin(s32) const;
|
||||
bool checkShowNewItemAndPrepareSave(const GameDataHolderAccessor&, bool, s32);
|
||||
bool checkExistNewItem(const GameDataHolderAccessor&, s32, s32, bool) const;
|
||||
void write(al::ByamlWriter*) override;
|
||||
void read(const al::ByamlIter&) override;
|
||||
void write(al::ByamlWriter* writer) override;
|
||||
void read(const al::ByamlIter& save) override;
|
||||
|
||||
bool isInNormalCoinShopFirst() const { return mIsInNormalCoinShopFirst; }
|
||||
|
||||
|
|
|
|||
|
|
@ -13,8 +13,8 @@ class TimeBalloonSaveData : public ByamlSave {
|
|||
public:
|
||||
TimeBalloonSaveData();
|
||||
void init();
|
||||
void write(al::ByamlWriter*) override;
|
||||
void read(const al::ByamlIter&) override;
|
||||
void write(al::ByamlWriter* writer) override;
|
||||
void read(const al::ByamlIter& save) override;
|
||||
|
||||
bool isExplainedTutorial() const { return mIsExplainedTutorial; }
|
||||
|
||||
|
|
|
|||
|
|
@ -15,8 +15,8 @@ public:
|
|||
void init();
|
||||
bool checkAlreadyVisit(const char*) const;
|
||||
void visit(const char*);
|
||||
void write(al::ByamlWriter*);
|
||||
void read(const al::ByamlIter&);
|
||||
void write(al::ByamlWriter* writer);
|
||||
void read(const al::ByamlIter& save);
|
||||
|
||||
private:
|
||||
void* _8;
|
||||
|
|
|
|||
|
|
@ -22,8 +22,8 @@ public:
|
|||
void setTalkSpecial(bool isTalkFindKoopa, bool isTalkBossRaid);
|
||||
bool isTalkFindKoopa() const;
|
||||
bool isTalkBossRaid() const;
|
||||
void write(al::ByamlWriter*) override;
|
||||
void read(const al::ByamlIter&) override;
|
||||
void write(al::ByamlWriter* writer) override;
|
||||
void read(const al::ByamlIter& save) override;
|
||||
|
||||
private:
|
||||
s32 mSize;
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@ s32 calcHaveGiftNum(GameDataHolderAccessor accessor);
|
|||
bool checkCompleteGift(GameDataHolderAccessor accessor, s32 fileId);
|
||||
const sead::PtrArray<ShopItem::ItemInfo>& getStickerList(GameDataHolderAccessor accessor);
|
||||
s32 getStickerListSize(GameDataHolderAccessor accessor);
|
||||
bool isHaveSticker(GameDataHolderAccessor accessor, s32 fileId);
|
||||
bool isHaveSticker(GameDataHolderAccessor accessor, s32 stickerIdx);
|
||||
s32 calcHaveStickerNum(GameDataHolderAccessor accessor);
|
||||
bool checkCompleteSticker(GameDataHolderAccessor accessor, s32 fileId);
|
||||
const char* getTestClothesName();
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ bool isClosetScenePlayer(const PlayerInitInfo&);
|
|||
al::GamePadSystem* getGamePadSystem(const PlayerInitInfo&);
|
||||
const char* getInitCapTypeName(const PlayerInitInfo&);
|
||||
al::SklAnimRetargettingInfo* createPlayerSklRetargettingInfo(al::LiveActor*, const sead::Vector3f&);
|
||||
const sead::Vector3f& getPlayerPos(const al::LiveActor*);
|
||||
const sead::Vector3f& getPlayerPos(const al::LiveActor* actor);
|
||||
const sead::Vector3f& getPlayerHeadPos(const al::LiveActor*);
|
||||
const sead::Vector3f& getPlayerBodyPos(const al::LiveActor*);
|
||||
void calcPlayerSideDir(sead::Vector3f*, const al::LiveActor*);
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ WaterSurfaceShadow* tryCreateWaterSurfaceShadow(const al::ActorInitInfo& initInf
|
|||
|
||||
if (!useWaterSurfaceShadow)
|
||||
return nullptr;
|
||||
if (archiveName == nullptr)
|
||||
if (!archiveName)
|
||||
return new WaterSurfaceShadow(initInfo, "WaterSurfaceShadow");
|
||||
return new WaterSurfaceShadow(initInfo, archiveName);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,14 +12,17 @@ class WaterSurfaceShadow;
|
|||
|
||||
namespace rs {
|
||||
|
||||
f32 setShadowDropLength(al::LiveActor*, const al::ActorInitInfo&, const char*);
|
||||
void calcShadowDropClippingCenter(sead::Vector3f*, const al::LiveActor*, f32, f32);
|
||||
void setShadowDropOffset(al::LiveActor*, const char*, f32);
|
||||
WaterSurfaceShadow* tryCreateWaterSurfaceShadow(const al::ActorInitInfo&, const char*);
|
||||
WaterSurfaceShadow* tryCreateWaterSurfaceCoinShadow(const al::ActorInitInfo&);
|
||||
void tryUpdateWaterSurfaceCoinShadow(WaterSurfaceShadow*, al::LiveActor*, f32);
|
||||
void initHackShadow(al::LiveActor*);
|
||||
void setupHackShadow(al::LiveActor*);
|
||||
void endHackShadow(al::LiveActor*);
|
||||
f32 setShadowDropLength(al::LiveActor* actor, const al::ActorInitInfo& initInfo,
|
||||
const char* maskName);
|
||||
void calcShadowDropClippingCenter(sead::Vector3f* vec, const al::LiveActor* actor, f32 f, f32 f2);
|
||||
void setShadowDropOffset(al::LiveActor* actor, const char* maskName, f32 distance);
|
||||
WaterSurfaceShadow* tryCreateWaterSurfaceShadow(const al::ActorInitInfo& initInfo,
|
||||
const char* archiveName);
|
||||
WaterSurfaceShadow* tryCreateWaterSurfaceCoinShadow(const al::ActorInitInfo& initInfo);
|
||||
void tryUpdateWaterSurfaceCoinShadow(WaterSurfaceShadow* shadow, al::LiveActor* actor,
|
||||
f32 distance);
|
||||
void initHackShadow(al::LiveActor* actor);
|
||||
void setupHackShadow(al::LiveActor* actor);
|
||||
void endHackShadow(al::LiveActor* actor);
|
||||
|
||||
} // namespace rs
|
||||
|
|
|
|||
|
|
@ -429,7 +429,7 @@ def header_check_line(line, path, visibility, should_start_class, is_in_struct):
|
|||
elif visibility == 2: # private
|
||||
if line == "};" or line == "" or line == "union {" or line.startswith("struct") or line.startswith("enum"): return
|
||||
newline = line
|
||||
if line.startswith("static_assert"):
|
||||
if line.startswith("static_assert") or "template" in line:
|
||||
return
|
||||
elif "=" in line:
|
||||
newline = line.split("=")[0].strip()
|
||||
|
|
|
|||
Loading…
Reference in a new issue