PrimeDecomp
/
prime
mirror of https://github.com/PrimeDecomp/prime.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Match and link CBSGenerate

This commit is contained in:
Henrique Gemignani Passos Lima 2022-10-28 14:26:17 +03:00
parent 07479bf310
commit ec41101509
No known key found for this signature in database
GPG Key ID: E224F951761145F8
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.py
View File

@ -204,7 +204,7 @@ LIBS = [
["MetroidPrime/BodyState/CBSSlide", False], ["MetroidPrime/BodyState/CBSSlide", False],
"MetroidPrime/BodyState/CBSHurled", "MetroidPrime/BodyState/CBSHurled",
"MetroidPrime/BodyState/CBSJump", "MetroidPrime/BodyState/CBSJump",
["MetroidPrime/BodyState/CBSGenerate", False], ["MetroidPrime/BodyState/CBSGenerate", True],
"MetroidPrime/Enemies/CPuddleSpore", "MetroidPrime/Enemies/CPuddleSpore",
"MetroidPrime/BodyState/CBSTaunt", "MetroidPrime/BodyState/CBSTaunt",
"MetroidPrime/CSortedLists", "MetroidPrime/CSortedLists",

2
obj_files.mk
View File

@ -169,7 +169,7 @@ METROIDPRIME :=\
$(BUILD_DIR)/asm/MetroidPrime/BodyState/CBSSlide.o\ $(BUILD_DIR)/asm/MetroidPrime/BodyState/CBSSlide.o\
$(BUILD_DIR)/asm/MetroidPrime/BodyState/CBSHurled.o\ $(BUILD_DIR)/asm/MetroidPrime/BodyState/CBSHurled.o\
$(BUILD_DIR)/asm/MetroidPrime/BodyState/CBSJump.o\ $(BUILD_DIR)/asm/MetroidPrime/BodyState/CBSJump.o\
$(BUILD_DIR)/asm/MetroidPrime/BodyState/CBSGenerate.o\ $(BUILD_DIR)/src/MetroidPrime/BodyState/CBSGenerate.o\
$(BUILD_DIR)/asm/MetroidPrime/Enemies/CPuddleSpore.o\ $(BUILD_DIR)/asm/MetroidPrime/Enemies/CPuddleSpore.o\
$(BUILD_DIR)/asm/MetroidPrime/BodyState/CBSTaunt.o\ $(BUILD_DIR)/asm/MetroidPrime/BodyState/CBSTaunt.o\
$(BUILD_DIR)/asm/MetroidPrime/CSortedLists.o\ $(BUILD_DIR)/asm/MetroidPrime/CSortedLists.o\

5
src/MetroidPrime/BodyState/CBSGenerate.cpp
View File

@ -40,8 +40,9 @@ pas::EAnimationState CBSGenerate::UpdateBody(float dt, CBodyController& bc,
CStateManager& mgr) override { CStateManager& mgr) override {
const pas::EAnimationState st = GetBodyStateTransition(dt, bc); const pas::EAnimationState st = GetBodyStateTransition(dt, bc);
if (st == pas::kAS_Invalid) { if (st == pas::kAS_Invalid) {
if (bc.GetCommandMgr().GetTargetVector().IsNonZero()) { CBodyStateCmdMgr& commandMgr = bc.CommandMgr();
bc.FaceDirection(bc.GetCommandMgr().GetTargetVector(), dt); if (commandMgr.GetTargetVector().IsNonZero()) {
bc.FaceDirection(commandMgr.GetTargetVector(), dt);
} }
} }
return st; return st;