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/TrainerWrapper.cpp | |
| parent | e801b73a2f9cb845913cf546002c8f50eefc473c (diff) | |
| download | sigen-8e278873d4bd35a7cd7f3b6d9d7852fa422370b8.tar.gz sigen-8e278873d4bd35a7cd7f3b6d9d7852fa422370b8.tar.xz sigen-8e278873d4bd35a7cd7f3b6d9d7852fa422370b8.zip | |
Merged CHECK macro branch
Diffstat (limited to 'sigscript/TrainerWrapper.cpp')
| -rw-r--r-- | sigscript/TrainerWrapper.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sigscript/TrainerWrapper.cpp b/sigscript/TrainerWrapper.cpp index 34751aa7..52a8f99b 100644 --- a/sigscript/TrainerWrapper.cpp +++ b/sigscript/TrainerWrapper.cpp @@ -55,8 +55,7 @@ QString Sigscript::TrainerWrapper::TrainerWrapper::name() const int Sigscript::TrainerWrapper::TrainerWrapper::moneyFactor() const { - if (sigmod()->singlePlayer() && hasValueOfType<int>("moneyFactor")) - return valueOfType<int>("moneyFactor"); + ALLOW_OVERRIDE_SO(trainer, int, moneyFactor); return m_trainer->moneyFactor(); } @@ -67,8 +66,7 @@ Sigscript::SkinWrapper* Sigscript::TrainerWrapper::TrainerWrapper::skin() int Sigscript::TrainerWrapper::TrainerWrapper::depth() const { - if (sigmod()->singlePlayer() && hasValueOfType<int>("depth")) - return valueOfType<int>("depth"); + ALLOW_OVERRIDE_SO(trainer, int, depth); return m_trainer->depth(); } |