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/MoveWrapper.cpp | |
| parent | e801b73a2f9cb845913cf546002c8f50eefc473c (diff) | |
| download | sigen-8e278873d4bd35a7cd7f3b6d9d7852fa422370b8.tar.gz sigen-8e278873d4bd35a7cd7f3b6d9d7852fa422370b8.tar.xz sigen-8e278873d4bd35a7cd7f3b6d9d7852fa422370b8.zip | |
Merged CHECK macro branch
Diffstat (limited to 'sigscript/MoveWrapper.cpp')
| -rw-r--r-- | sigscript/MoveWrapper.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sigscript/MoveWrapper.cpp b/sigscript/MoveWrapper.cpp index 8242e88f..17c3b4f2 100644 --- a/sigscript/MoveWrapper.cpp +++ b/sigscript/MoveWrapper.cpp @@ -42,15 +42,13 @@ QString Sigscript::MoveWrapper::name() const Sigcore::Fraction Sigscript::MoveWrapper::accuracy() const { - if (sigmod()->singlePlayer() && hasValueOfType<Sigcore::Fraction>("accuracy")) - return valueOfType<Sigcore::Fraction>("accuracy"); + ALLOW_OVERRIDE_SO(move, Sigcore::Fraction, accuracy); return m_move->accuracy(); } int Sigscript::MoveWrapper::power() const { - if (sigmod()->singlePlayer() && hasValueOfType<int>("power")) - return valueOfType<int>("power"); + ALLOW_OVERRIDE_SO(move, int, power); return m_move->power(); } @@ -71,8 +69,7 @@ int Sigscript::MoveWrapper::powerPoints() const int Sigscript::MoveWrapper::priority() const { - if (sigmod()->singlePlayer() && hasValueOfType<int>("priority")) - return valueOfType<int>("priority"); + ALLOW_OVERRIDE_SO(move, int, priority); return m_move->priority(); } |