AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

CKnockBackController: Simplify initialization of x24_ in constructor 

Same behavior, less code.
This commit is contained in:
Lioncash 2020-04-17 13:17:01 -04:00
parent 26ac3b166d
commit 5491f3ff23
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Runtime/World/CKnockBackController.cpp
View File

@ -372,10 +372,7 @@ CKnockBackController::CKnockBackController(EKnockBackVariant variant)
, x82_24_(true) , x82_24_(true)
, x82_25_inDeferredKnockBack(false) , x82_25_inDeferredKnockBack(false)
, x82_26_locomotionDuringElectrocution(false) { , x82_26_locomotionDuringElectrocution(false) {
for (int i = 0; i < 5; ++i) { x24_.resize(x24_.capacity(), std::make_pair(0.0f, FLT_MAX));
x24_.push_back(std::make_pair(0.f, FLT_MAX));
x80_availableStates.set(i);
}
} }
void CKnockBackController::ApplyImpulse(float dt, CPatterned& parent) { void CKnockBackController::ApplyImpulse(float dt, CPatterned& parent) {

2
Runtime/World/CKnockBackController.hpp
View File

@ -85,7 +85,7 @@ private:
u32 x70_ = 0; u32 x70_ = 0;
u32 x74_ = 0; u32 x74_ = 0;
pas::ESeverity x7c_severity = pas::ESeverity::One; pas::ESeverity x7c_severity = pas::ESeverity::One;
std::bitset<5> x80_availableStates; std::bitset<5> x80_availableStates{0b11111};
bool x81_24_autoResetImpulse : 1; // t bool x81_24_autoResetImpulse : 1; // t
bool x81_25_enableFreeze : 1; // t bool x81_25_enableFreeze : 1; // t
bool x81_26_enableShock : 1; bool x81_26_enableShock : 1;