Skip to content

Commit 7dcfb2f

Browse files
CauselessCauseless
committed
m_MoveState renamed to m_MovementState to be consistent with script
1 parent c09acd0 commit 7dcfb2f

File tree

4 files changed

+72
-72
lines changed

4 files changed

+72
-72
lines changed

‎Source/Entities/ACrab.cpp

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ void ACrab::Clear() {
4949
m_BackupRBGFootGroup = nullptr;
5050
m_StrideSound = nullptr;
5151
m_pJetpack = nullptr;
52-
m_MoveState = STAND;
52+
m_MovementState = STAND;
5353
m_StrideFrame = false;
5454
for (int side = 0; side < SIDECOUNT; ++side) {
5555
for (int layer = 0; layer < LAYERCOUNT; ++layer) {
@@ -205,7 +205,7 @@ int ACrab::Create(const ACrab& reference) {
205205
m_StrideSound = dynamic_cast<SoundContainer*>(reference.m_StrideSound->Clone());
206206
}
207207

208-
m_MoveState = reference.m_MoveState;
208+
m_MovementState = reference.m_MovementState;
209209

210210
for (int side = 0; side < SIDECOUNT; ++side) {
211211
for (int i = 0; i < MOVEMENTSTATECOUNT; ++i) {
@@ -800,45 +800,45 @@ void ACrab::PreControllerUpdate() {
800800
bool keepOldState = m_Controller.IsKeyboardOnlyControlled() && m_Controller.IsState(PIE_MENU_ACTIVE);
801801

802802
if (!keepOldState) {
803-
if (m_Controller.IsState(MOVE_RIGHT) || m_Controller.IsState(MOVE_LEFT) || m_MoveState == JUMP && m_Status != INACTIVE) {
804-
if (m_MoveState != JUMP) {
803+
if (m_Controller.IsState(MOVE_RIGHT) || m_Controller.IsState(MOVE_LEFT) || m_MovementState == JUMP && m_Status != INACTIVE) {
804+
if (m_MovementState != JUMP) {
805805
// Restart the stride if we're just starting to walk or crawl
806-
if (m_MoveState != WALK) {
806+
if (m_MovementState != WALK) {
807807
m_StrideStart[LEFTSIDE] = true;
808808
m_StrideStart[RIGHTSIDE] = true;
809809
MoveOutOfTerrain(g_MaterialGrass);
810810
}
811811

812-
m_MoveState = WALK;
812+
m_MovementState = WALK;
813813

814814
// Was never actually used
815815
//for (int side = 0; side < SIDECOUNT; ++side) {
816-
// m_Paths[side][FGROUND][m_MoveState].SetSpeed(m_Controller.IsState(MOVE_FAST) ? FAST : NORMAL);
817-
// m_Paths[side][BGROUND][m_MoveState].SetSpeed(m_Controller.IsState(MOVE_FAST) ? FAST : NORMAL);
816+
// m_Paths[side][FGROUND][m_MovementState].SetSpeed(m_Controller.IsState(MOVE_FAST) ? FAST : NORMAL);
817+
// m_Paths[side][BGROUND][m_MovementState].SetSpeed(m_Controller.IsState(MOVE_FAST) ? FAST : NORMAL);
818818
//}
819819
}
820820

821821
// Walk backwards if the aiming is already focused in the opposite direction of travel.
822822
if (std::abs(analogAim.m_X) > 0 || m_Controller.IsState(AIM_SHARP)) {
823823
for (int side = 0; side < SIDECOUNT; ++side) {
824-
m_Paths[side][FGROUND][m_MoveState].SetHFlip(m_Controller.IsState(MOVE_LEFT));
825-
m_Paths[side][BGROUND][m_MoveState].SetHFlip(m_Controller.IsState(MOVE_LEFT));
824+
m_Paths[side][FGROUND][m_MovementState].SetHFlip(m_Controller.IsState(MOVE_LEFT));
825+
m_Paths[side][BGROUND][m_MovementState].SetHFlip(m_Controller.IsState(MOVE_LEFT));
826826
}
827827
} else if ((m_Controller.IsState(MOVE_RIGHT) && m_HFlipped) || (m_Controller.IsState(MOVE_LEFT) && !m_HFlipped)) {
828828
m_HFlipped = !m_HFlipped;
829829
m_CheckTerrIntersection = true;
830830
MoveOutOfTerrain(g_MaterialGrass);
831831
for (int side = 0; side < SIDECOUNT; ++side) {
832832
for (int layer = 0; layer < LAYERCOUNT; ++layer) {
833-
m_Paths[side][layer][m_MoveState].SetHFlip(m_HFlipped);
833+
m_Paths[side][layer][m_MovementState].SetHFlip(m_HFlipped);
834834
m_Paths[side][layer][WALK].Terminate();
835835
m_Paths[side][layer][STAND].Terminate();
836836
}
837837
m_StrideStart[side] = true;
838838
}
839839
}
840840
} else {
841-
m_MoveState = STAND;
841+
m_MovementState = STAND;
842842
}
843843
}
844844

@@ -899,7 +899,7 @@ void ACrab::PreControllerUpdate() {
899899
MoveOutOfTerrain(g_MaterialGrass);
900900
for (int side = 0; side < SIDECOUNT; ++side) {
901901
for (int layer = 0; layer < LAYERCOUNT; ++layer) {
902-
m_Paths[side][layer][m_MoveState].SetHFlip(m_HFlipped);
902+
m_Paths[side][layer][m_MovementState].SetHFlip(m_HFlipped);
903903
m_Paths[side][layer][WALK].Terminate();
904904
m_Paths[side][layer][STAND].Terminate();
905905
}
@@ -931,7 +931,7 @@ void ACrab::PreControllerUpdate() {
931931
if (aimMag < 0.1F) {
932932
aimMag = 1.0F;
933933
}
934-
if (m_MoveState == WALK) {
934+
if (m_MovementState == WALK) {
935935
aimMag *= 0.3F;
936936
}
937937

@@ -968,7 +968,7 @@ void ACrab::PreControllerUpdate() {
968968

969969
// Controller disabled
970970
if (m_Controller.IsDisabled()) {
971-
m_MoveState = STAND;
971+
m_MovementState = STAND;
972972
if (m_pJetpack && m_pJetpack->IsAttached())
973973
m_pJetpack->EnableEmission(false);
974974
}
@@ -983,25 +983,25 @@ void ACrab::PreControllerUpdate() {
983983

984984
if (m_Status == STABLE && !m_LimbPushForcesAndCollisionsDisabled) {
985985
// This exists to support disabling foot collisions if the limbpath has that flag set.
986-
if ((m_pLFGFootGroup->GetAtomCount() == 0 && m_BackupLFGFootGroup->GetAtomCount() > 0) != m_Paths[LEFTSIDE][FGROUND][m_MoveState].FootCollisionsShouldBeDisabled()) {
986+
if ((m_pLFGFootGroup->GetAtomCount() == 0 && m_BackupLFGFootGroup->GetAtomCount() > 0) != m_Paths[LEFTSIDE][FGROUND][m_MovementState].FootCollisionsShouldBeDisabled()) {
987987
m_BackupLFGFootGroup->SetLimbPos(m_pLFGFootGroup->GetLimbPos());
988988
std::swap(m_pLFGFootGroup, m_BackupLFGFootGroup);
989989
}
990-
if ((m_pLBGFootGroup->GetAtomCount() == 0 && m_BackupLBGFootGroup->GetAtomCount() > 0) != m_Paths[LEFTSIDE][BGROUND][m_MoveState].FootCollisionsShouldBeDisabled()) {
990+
if ((m_pLBGFootGroup->GetAtomCount() == 0 && m_BackupLBGFootGroup->GetAtomCount() > 0) != m_Paths[LEFTSIDE][BGROUND][m_MovementState].FootCollisionsShouldBeDisabled()) {
991991
m_BackupLBGFootGroup->SetLimbPos(m_pLBGFootGroup->GetLimbPos());
992992
std::swap(m_pLBGFootGroup, m_BackupLBGFootGroup);
993993
}
994-
if ((m_pRFGFootGroup->GetAtomCount() == 0 && m_BackupRFGFootGroup->GetAtomCount() > 0) != m_Paths[RIGHTSIDE][FGROUND][m_MoveState].FootCollisionsShouldBeDisabled()) {
994+
if ((m_pRFGFootGroup->GetAtomCount() == 0 && m_BackupRFGFootGroup->GetAtomCount() > 0) != m_Paths[RIGHTSIDE][FGROUND][m_MovementState].FootCollisionsShouldBeDisabled()) {
995995
m_BackupRFGFootGroup->SetLimbPos(m_pRFGFootGroup->GetLimbPos());
996996
std::swap(m_pRFGFootGroup, m_BackupRFGFootGroup);
997997
}
998-
if ((m_pRBGFootGroup->GetAtomCount() == 0 && m_BackupRBGFootGroup->GetAtomCount() > 0) != m_Paths[RIGHTSIDE][BGROUND][m_MoveState].FootCollisionsShouldBeDisabled()) {
998+
if ((m_pRBGFootGroup->GetAtomCount() == 0 && m_BackupRBGFootGroup->GetAtomCount() > 0) != m_Paths[RIGHTSIDE][BGROUND][m_MovementState].FootCollisionsShouldBeDisabled()) {
999999
m_BackupRBGFootGroup->SetLimbPos(m_pRBGFootGroup->GetLimbPos());
10001000
std::swap(m_pRBGFootGroup, m_BackupRBGFootGroup);
10011001
}
10021002

10031003
// WALKING
1004-
if (m_MoveState == WALK) {
1004+
if (m_MovementState == WALK) {
10051005
for (int side = 0; side < SIDECOUNT; ++side)
10061006
for (int layer = 0; layer < LAYERCOUNT; ++layer)
10071007
m_Paths[side][layer][STAND].Terminate();
@@ -1081,7 +1081,7 @@ void ACrab::PreControllerUpdate() {
10811081
RunScriptedFunctionInAppropriateScripts("OnStride");
10821082
}
10831083
} else if (m_pLFGLeg || m_pLBGLeg || m_pRFGLeg || m_pRBGLeg) {
1084-
if (m_MoveState == JUMP) {
1084+
if (m_MovementState == JUMP) {
10851085
// TODO: Utilize jump paths in an intuitive way?
10861086
if (m_pLFGLeg) {
10871087
m_pLFGFootGroup->FlailAsLimb(m_Pos, RotateOffset(m_pLFGLeg->GetParentOffset()), m_pLFGLeg->GetMaxLength(), m_PrevVel, m_AngularVel, m_pLFGLeg->GetMass(), deltaTime);
@@ -1097,7 +1097,7 @@ void ACrab::PreControllerUpdate() {
10971097
}
10981098

10991099
if (m_pJetpack == nullptr || m_pJetpack->IsOutOfFuel()) {
1100-
m_MoveState = STAND;
1100+
m_MovementState = STAND;
11011101
m_Paths[LEFTSIDE][FGROUND][JUMP].Terminate();
11021102
m_Paths[LEFTSIDE][BGROUND][JUMP].Terminate();
11031103
m_Paths[LEFTSIDE][FGROUND][STAND].Terminate();
@@ -1153,7 +1153,7 @@ void ACrab::PreControllerUpdate() {
11531153
m_pRBGFootGroup->FlailAsLimb(m_Pos, RotateOffset(m_pRBGLeg->GetParentOffset()), m_pRBGLeg->GetMaxLength(), m_PrevVel * m_pRBGLeg->GetJointStiffness(), m_AngularVel, m_pRBGLeg->GetMass(), deltaTime);
11541154
}
11551155
}
1156-
if (m_MoveState != WALK && m_StrideSound && m_StrideSound->GetLoopSetting() < 0) {
1156+
if (m_MovementState != WALK && m_StrideSound && m_StrideSound->GetLoopSetting() < 0) {
11571157
m_StrideSound->Stop();
11581158
}
11591159

‎Source/Entities/ACraft.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ MOSRotating* ACraft::Exit::SuckInMOs(ACraft* pExitOwner) {
180180
void ACraft::Clear() {
181181
m_AIMode = AIMODE_DELIVER;
182182

183-
m_MoveState = NOMOVE;
183+
m_MovementState = NOMOVE;
184184
m_HatchState = CLOSED;
185185
m_HatchTimer.Reset();
186186
m_HatchDelay = 0;
@@ -225,7 +225,7 @@ int ACraft::Create() {
225225
int ACraft::Create(const ACraft& reference) {
226226
Actor::Create(reference);
227227

228-
m_MoveState = reference.m_MoveState;
228+
m_MovementState = reference.m_MovementState;
229229
m_HatchState = reference.m_HatchState;
230230
m_HatchDelay = reference.m_HatchDelay;
231231
if (reference.m_HatchOpenSound) {

0 commit comments

Comments
 (0)