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

Link CTweakPlayerControl 

Former-commit-id: b45d9d9a48
This commit is contained in:
Luke Street 2022-10-18 23:46:19 -04:00
parent 4b54017b62
commit 2460b6e91b
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.py
View File

@ -81,7 +81,7 @@ LIBS = [
"MetroidPrime/HUD/CSamusHud", "MetroidPrime/HUD/CSamusHud",
"MetroidPrime/CAnimationDatabaseGame", "MetroidPrime/CAnimationDatabaseGame",
"MetroidPrime/CTransitionDatabaseGame", "MetroidPrime/CTransitionDatabaseGame",
["MetroidPrime/Tweaks/CTweakPlayerControl", False], ["MetroidPrime/Tweaks/CTweakPlayerControl", True],
"MetroidPrime/Tweaks/CTweakPlayerGun", "MetroidPrime/Tweaks/CTweakPlayerGun",
"MetroidPrime/CPauseScreen", "MetroidPrime/CPauseScreen",
"MetroidPrime/Tweaks/CTweakGui", "MetroidPrime/Tweaks/CTweakGui",

6
include/MetroidPrime/Tweaks/CTweakPlayerControl.hpp
View File

@ -12,15 +12,15 @@
class CInputStream; class CInputStream;
class CTweakPlayerControl; class CTweakPlayerControl;
class CTweakPlayerControl : public ITweakObject, public TOneStatic< CTweakPlayerControl > { class CTweakPlayerControl : public ITweakObject {
public: public:
CTweakPlayerControl(CInputStream&); CTweakPlayerControl(CInputStream&);
~CTweakPlayerControl() override; ~CTweakPlayerControl() override;
ControlMapper::EFunctionList GetMapping(ControlMapper::ECommands command) const; ControlMapper::EFunctionList GetMapping(ControlMapper::ECommands command) const;
private: private:
rstl::reserved_vector<ControlMapper::EFunctionList, 67> m_mappings; rstl::reserved_vector< ControlMapper::EFunctionList, 67 > m_mappings;
}; };
#endif // _CTWEAKPLAYERCONTROL #endif // _CTWEAKPLAYERCONTROL

2
obj_files.mk
View File

@ -48,7 +48,7 @@ METROIDPRIME :=\
$(BUILD_DIR)/asm/MetroidPrime/HUD/CSamusHud.o\ $(BUILD_DIR)/asm/MetroidPrime/HUD/CSamusHud.o\
$(BUILD_DIR)/asm/MetroidPrime/CAnimationDatabaseGame.o\ $(BUILD_DIR)/asm/MetroidPrime/CAnimationDatabaseGame.o\
$(BUILD_DIR)/asm/MetroidPrime/CTransitionDatabaseGame.o\ $(BUILD_DIR)/asm/MetroidPrime/CTransitionDatabaseGame.o\
$(BUILD_DIR)/asm/MetroidPrime/Tweaks/CTweakPlayerControl.o\ $(BUILD_DIR)/src/MetroidPrime/Tweaks/CTweakPlayerControl.o\
$(BUILD_DIR)/asm/MetroidPrime/Tweaks/CTweakPlayerGun.o\ $(BUILD_DIR)/asm/MetroidPrime/Tweaks/CTweakPlayerGun.o\
$(BUILD_DIR)/asm/MetroidPrime/CPauseScreen.o\ $(BUILD_DIR)/asm/MetroidPrime/CPauseScreen.o\
$(BUILD_DIR)/asm/MetroidPrime/Tweaks/CTweakGui.o\ $(BUILD_DIR)/asm/MetroidPrime/Tweaks/CTweakGui.o\

4
src/MetroidPrime/Tweaks/CTweakPlayerControl.cpp
View File

@ -7,7 +7,7 @@ CTweakPlayerControl::~CTweakPlayerControl() {}
rstl::reserved_vector< ControlMapper::EFunctionList, 67 > LoadMappings(CInputStream& in) { rstl::reserved_vector< ControlMapper::EFunctionList, 67 > LoadMappings(CInputStream& in) {
rstl::reserved_vector< ControlMapper::EFunctionList, 67 > result; rstl::reserved_vector< ControlMapper::EFunctionList, 67 > result;
for (int i = 0; i < result.capacity(); ++i) { for (int i = 0; i < result.capacity(); ++i) {
result.push_back(static_cast<ControlMapper::EFunctionList>(in.ReadLong())); result.push_back(static_cast< ControlMapper::EFunctionList >(in.ReadLong()));
} }
return result; return result;
} }
@ -18,6 +18,6 @@ ControlMapper::EFunctionList
CTweakPlayerControl::GetMapping(ControlMapper::ECommands command) const { CTweakPlayerControl::GetMapping(ControlMapper::ECommands command) const {
if (command < ControlMapper::kC_Forward || command > ControlMapper::kC_UNKNOWN - 1) if (command < ControlMapper::kC_Forward || command > ControlMapper::kC_UNKNOWN - 1)
return m_mappings[0]; return m_mappings[0];
return m_mappings[command]; return m_mappings[command];
} }