diff options
| author | Ben Boeckel <MathStuf@gmail.com> | 2008-12-29 12:09:27 -0500 |
|---|---|---|
| committer | Ben Boeckel <MathStuf@gmail.com> | 2008-12-29 12:09:27 -0500 |
| commit | 8e278873d4bd35a7cd7f3b6d9d7852fa422370b8 (patch) | |
| tree | 9e97b71d30779c07c79ca166e1d704a3de4d5e4f /sigscript/AbilityWrapper.cpp | |
| parent | e801b73a2f9cb845913cf546002c8f50eefc473c (diff) | |
| download | sigen-8e278873d4bd35a7cd7f3b6d9d7852fa422370b8.tar.gz sigen-8e278873d4bd35a7cd7f3b6d9d7852fa422370b8.tar.xz sigen-8e278873d4bd35a7cd7f3b6d9d7852fa422370b8.zip | |
Merged CHECK macro branch
Diffstat (limited to 'sigscript/AbilityWrapper.cpp')
| -rw-r--r-- | sigscript/AbilityWrapper.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sigscript/AbilityWrapper.cpp b/sigscript/AbilityWrapper.cpp index a08a8e4e..6627f5f7 100644 --- a/sigscript/AbilityWrapper.cpp +++ b/sigscript/AbilityWrapper.cpp @@ -42,8 +42,7 @@ QString Sigscript::AbilityWrapper::name() const int Sigscript::AbilityWrapper::priority() const { - if (sigmod()->singlePlayer() && hasValueOfType<int>("priority")) - return valueOfType<int>("priority"); + ALLOW_OVERRIDE_SO(ability, int, priority); return m_ability->priority(); } |