Game-Decompilation/Petari
1
0
Fork 0
mirror of https://github.com/SMGCommunity/Petari.git synced 2024-11-26 23:10:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix even more linker errors

Browse Source
This commit is contained in:
shibbo 2024-10-16 16:53:28 -04:00
parent 0a9d714248
commit 3a50e41bb9
16 changed files with 25 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/Game/MapObj/AstroDemoFunction.hpp
View File

@ -11,6 +11,6 @@ public:
static const char* getGrandStarReturnDemoName(int);
static bool tryRegisterDemo(LiveActor *, const char *, const JMapInfoIter &);
static bool tryRegisterGrandStarReturnWithFunctionAndSimpleCast(LiveActor *, const JMapInfoIter &);
static bool tryRegisterGrandStarReturnAndSimpleCast(LiveActor *, const JMapInfoIter &);
static bool tryRegisterGrandStarReturnWithFunctionAndSimpleCast(LiveActor *, const JMapInfoIter &, const MR::FunctorBase &);
};
};

2
include/Game/MapObj/BenefitItemObj.hpp
View File

@ -100,4 +100,4 @@ namespace NrvBenefitItemObj {
NERVE(HostTypeNrvAppearGround);
NERVE(HostTypeNrvPreEscape);
NERVE(HostTypeNrvEscape);
};
};

4
include/Game/MapObj/LargeChainParts.hpp
View File

@ -6,9 +6,9 @@ class LargeChainParts : public LiveActor {
public:
LargeChainParts(const char *pName = "でかい鎖パーツ");
virtual ~LargeChainParts();
inline virtual ~LargeChainParts();
virtual void kill();
void breakChainParts();
void initChainParts(TVec3f *, TVec3f *, TVec3f *, bool);
};
};

2
include/Game/MapObj/MapObjActorInitInfo.hpp
View File

@ -36,7 +36,7 @@ public:
void setupSeAppear();
void setupMirrorReflection(bool);
void setupPrepareChangeDummyTexture(const char *);
void setupNouseLodCtrl();
void setupNoUseLodCtrl();
bool mSetDefaultPosition; // 0x0
bool mConnectToScene; // 0x1

1
include/Game/MapObj/PunchingKinoko.hpp
View File

@ -25,7 +25,6 @@ public:
void initSensor();
void initCamera(const JMapInfoIter &);
void initJointControl();
void initNerve(const Nerve *);
bool requestPunch(HitSensor *, HitSensor *);
bool requestEnemyBlow(HitSensor *, HitSensor *);

4
include/Game/Util/LayoutUtil.hpp
View File

@ -38,8 +38,8 @@ namespace MR {
f32 getPaneAnimFrame(const LayoutActor*, const char*, u32);
void setFollowPos(const TVec2f*, const LayoutActor*, const char*);
void setFollowPos(const TVec2f&, const LayoutActor*, const char*);
void setFollowPos(const TVec2f*, LayoutActor*, const char*);
void setFollowPos(const TVec2f&, LayoutActor*, const char*);
void setFollowTypeReplace(const LayoutActor*, const char*);
void setFollowTypeAdd(const LayoutActor*, const char*);

4
include/Game/Util/MapPartsUtil.hpp
View File

@ -42,8 +42,6 @@ namespace MR {
bool isMapPartsShadowTypeNone(s32);
bool isMoveStartUnconditional(s32);
void setBodySensorType(LiveActor *, u32);
const HitSensor* getBodySensor(LiveActor *);
@ -65,4 +63,4 @@ namespace MR {
bool receiveMapPartsRotateMsg(LiveActor *, u32, MapPartsRailMover *, MapPartsRailRotator *);
void initMapPartsShadow(LiveActor *, const JMapInfoIter &);
};
};

6
include/Game/Util/RailUtil.hpp
View File

@ -60,9 +60,9 @@ namespace MR {
void moveRailRider(LiveActor *);
void moveCoordToEndPos(const LiveActor *);
void moveCoordToEndPos(LiveActor *);
void slowDownRailCoordSpeed(const LiveActor *, f32);
void slowDownRailCoordSpeed(LiveActor *, f32);
bool isRailGoingToEnd(const LiveActor *);
@ -80,4 +80,4 @@ namespace MR {
const TVec3f& getRailPointPosEnd(const LiveActor *);
void calcRailEndPointPos(TVec3f *, const LiveActor *);
void calcNearestRailPos(TVec3f *, const LiveActor *, const TVec3f &);
};
};

6
include/Game/Util/StarPointerUtil.hpp
View File

@ -25,9 +25,9 @@ namespace MR {
bool isStarPointerPointing2POnTriggerButton(const LiveActor *, const char *, bool, bool);
f32 getStarPointerScreenSpeed(u32);
f32 getStarPointerScreenSpeed(s32);
bool calcStarPointerWorldVelocityDirectionOnPlane(TVec3f *, const TVec3f &, const TVec3f &, u32);
bool calcStarPointerWorldVelocityDirectionOnPlane(TVec3f *, const TVec3f &, const TVec3f &, s32);
void createStarPointerLayout();
@ -40,4 +40,4 @@ namespace MR {
void getStarPointerWorldVelocityDirection(TVec3f *, s32);
void calcStarPointerWorldPointingPos(TVec3f *, const TVec3f &, s32);
};
};

6
src/Game/MapObj/AnmModelObj.cpp
View File

@ -260,6 +260,10 @@ void AnmModelObj::startInner() {
}
void AnmModelObj::moveInner() {
}
void AnmModelObj::stopInner() {
}
@ -302,4 +306,4 @@ bool AnmModelBindMove::isKilledAtMoveDone() const {
bool AnmModelGroundOnMove::isKilledAtMoveDone() const {
return true;
}
}

4
src/Game/MapObj/AstroMapBoard.cpp
View File

@ -18,7 +18,7 @@ void AstroMapBoard::init(const JMapInfoIter &rIter) {
info.setupFarClipping(-1.0f);
info.setupNoAppearRiddleSE();
initialize(rIter, info);
AstroDemoFunction::tryRegisterGrandStarReturnWithFunctionAndSimpleCast(this, rIter);
AstroDemoFunction::tryRegisterGrandStarReturnAndSimpleCast(this, rIter);
AstroDemoFunction::tryRegisterDemo(this, "ロゼッタトーチの炎説明デモ", rIter);
AstroDemoFunction::tryRegisterDemo(this, "ロゼッタトーチの炎進捗デモ", rIter);
@ -46,4 +46,4 @@ AstroMapBoard::~AstroMapBoard() {
namespace NrvAstroMapBoard {
INIT_NERVE(AstroMapBoardNrvWait);
};
};

9
src/Game/MapObj/BenefitItemInvincible.cpp
View File

@ -94,12 +94,3 @@ BenefitItemInvincible::~BenefitItemInvincible() {
void BenefitItemInvincible::runBck(const char *) {
}
namespace NrvBenefitItemObj {
INIT_NERVE(HostTypeNrvWait);
INIT_NERVE(HostTypeNrvShoot);
INIT_NERVE(HostTypeNrvCatch);
INIT_NERVE(HostTypeNrvAppearGround);
INIT_NERVE(HostTypeNrvPreEscape);
INIT_NERVE(HostTypeNrvEscape);
};

11
src/Game/MapObj/BenefitItemLifeUp.cpp
View File

@ -33,15 +33,6 @@ void BenefitItemLifeUp::runEfx(const char *pName) {
MR::emitEffect(this, str);
}
namespace NrvBenefitItemObj {
INIT_NERVE(HostTypeNrvWait);
INIT_NERVE(HostTypeNrvShoot);
INIT_NERVE(HostTypeNrvCatch);
INIT_NERVE(HostTypeNrvAppearGround);
INIT_NERVE(HostTypeNrvPreEscape);
INIT_NERVE(HostTypeNrvEscape);
};
void BenefitItemLifeUp::init(const JMapInfoIter &rIter) {
BenefitItemObj::init(rIter);
}
@ -55,4 +46,4 @@ void BenefitItemLifeUp::stopEfx(const char *pName) {
BenefitItemLifeUp::~BenefitItemLifeUp() {
}
}

9
src/Game/MapObj/BenefitItemObj.cpp
View File

@ -4,15 +4,6 @@
s16 def = 600;
static f32 zero = 0.0f;
namespace NrvBenefitItemObj {
INIT_NERVE(HostTypeNrvWait);
INIT_NERVE(HostTypeNrvShoot);
INIT_NERVE(HostTypeNrvCatch);
INIT_NERVE(HostTypeNrvAppearGround);
INIT_NERVE(HostTypeNrvPreEscape);
INIT_NERVE(HostTypeNrvEscape);
};
namespace {
const f32 cAppearThrowFwdSpd = 5.0f;
const f32 cBoundUpSpd = 20.0f;

2
src/Game/MapObj/RailMoveObj.cpp
View File

@ -40,7 +40,7 @@ void RailMoveObj::init(const JMapInfoIter &rIter) {
s32 condition_type = 0;
MR::getMapPartsArgMoveConditionType(&condition_type, rIter);
if (!MR::isMoveStartUnconditional(condition_type)) {
if (!MR::isMoveStartTypeUnconditional(condition_type)) {
setNerve(&NrvRailMoveObj::HostTypeWaitForPlayerOn::sInstance);
}

2
src/Game/MapObj/UFOKinoko.cpp
View File

@ -35,7 +35,7 @@ void UFOKinoko::init(const JMapInfoIter &rIter) {
bool arg7 = true;
MR::getJMapInfoArg7NoInit(rIter, &arg7);
if (arg7) {
info.setupNouseLodCtrl();
info.setupNoUseLodCtrl();
}
initialize(rIter, info);
MapObjActorUtil::startRotator(this);