epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #8319 from Mailaender/hacky-currentstate-nre

Browse Source 
Fixed possible NREs in AI.StateMachine
This commit is contained in:
Oliver Brakmann
2015-06-02 22:35:49 +02:00
parent 05e9b22af7 cd5c0eca79
commit 6650e3d9c7
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Mods.Common/AI/StateMachine.cs
View File

@@ -17,7 +17,8 @@ namespace OpenRA.Mods.Common.AI
public void Update(Squad squad)
{
currentState.Tick(squad);
if (currentState != null)
currentState.Tick(squad);
}
public void ChangeState(Squad squad, IState newState, bool rememberPrevious)
@@ -31,7 +32,8 @@ namespace OpenRA.Mods.Common.AI
if (newState != null)
currentState = newState;
currentState.Activate(squad);
if (currentState != null)
currentState.Activate(squad);
}
public void RevertToPreviousState(Squad squad, bool saveCurrentState)