diff options
| author | Ben Boeckel <MathStuf@gmail.com> | 2009-03-05 13:54:57 -0500 |
|---|---|---|
| committer | Ben Boeckel <MathStuf@gmail.com> | 2009-03-05 13:54:57 -0500 |
| commit | 2a62a95c2b05b9c991cbd3ca5834560aae5aba42 (patch) | |
| tree | 4a5ef4756a91ae36f2136bec9f1ca3fd3890964e /sigencore | |
| parent | 3e9f46a0a7a4ecb54ab865c74c72dcd1ee4c41a6 (diff) | |
| download | sigen-2a62a95c2b05b9c991cbd3ca5834560aae5aba42.tar.gz sigen-2a62a95c2b05b9c991cbd3ca5834560aae5aba42.tar.xz sigen-2a62a95c2b05b9c991cbd3ca5834560aae5aba42.zip | |
Fix action sorting
Diffstat (limited to 'sigencore')
| -rw-r--r-- | sigencore/plugins/arenas/standard/TurnArena.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sigencore/plugins/arenas/standard/TurnArena.cpp b/sigencore/plugins/arenas/standard/TurnArena.cpp index 6c6b7ef6..ba2977d3 100644 --- a/sigencore/plugins/arenas/standard/TurnArena.cpp +++ b/sigencore/plugins/arenas/standard/TurnArena.cpp @@ -36,8 +36,8 @@ using namespace Sigencore; bool sortActions(const TeamMember::RequestedAction& reqAction1, const TeamMember::RequestedAction& reqAction2) { - TeamMember::Action action1 = reqAction1.second.isFinished() ? reqAction1.second : TeamMember::Action(TeamMember::Timeout, TeamMember::ActionData()); - TeamMember::Action action2 = reqAction2.second.isFinished() ? reqAction2.second : TeamMember::Action(TeamMember::Timeout, TeamMember::ActionData()); + TeamMember::Action action1 = reqAction1.second.isCanceled() ? TeamMember::Action(TeamMember::Timeout, TeamMember::ActionData()) : reqAction1.second; + TeamMember::Action action2 = reqAction2.second.isCanceled() ? TeamMember::Action(TeamMember::Timeout, TeamMember::ActionData()) : reqAction2.second; const int priority1 = actionPriority(reqAction1.first, action1); const int priority2 = actionPriority(reqAction1.first, action2); if (priority1 < priority2) |