AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-10 06:27:43 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/icesheegoth'

Browse Source
This commit is contained in:
Luke Street
2020-06-06 16:27:08 -04:00
parent feb163e107 5724be3294
commit ca96676057
13 changed files with 1812 additions and 479 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Runtime/World/CStateMachine.cpp
View File

@@ -77,7 +77,7 @@ void CStateMachineState::Update(CStateManager& mgr, CAi& ai, float delta) {
trig = trig->GetAnd();
}
}
if (andPassed && state) {
if (andPassed && state != nullptr) {
x4_state->CallFunc(mgr, ai, EStateMsg::Deactivate, 0.f);
x4_state = state;
Log.report(logvisor::Info, FMT_STRING("{} {} {} - {} {}"), ai.GetUniqueId(), ai.GetEditorId(), ai.GetName(),