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 /sigmod/Move.cpp | |
parent | e801b73a2f9cb845913cf546002c8f50eefc473c (diff) | |
download | sigen-8e278873d4bd35a7cd7f3b6d9d7852fa422370b8.tar.gz sigen-8e278873d4bd35a7cd7f3b6d9d7852fa422370b8.tar.xz sigen-8e278873d4bd35a7cd7f3b6d9d7852fa422370b8.zip |
Merged CHECK macro branch
Diffstat (limited to 'sigmod/Move.cpp')
-rw-r--r-- | sigmod/Move.cpp | 160 |
1 files changed, 39 insertions, 121 deletions
diff --git a/sigmod/Move.cpp b/sigmod/Move.cpp index 76fdc7f3..a03ffbae 100644 --- a/sigmod/Move.cpp +++ b/sigmod/Move.cpp @@ -70,9 +70,10 @@ void Sigmod::Move::validate() TEST_BEGIN(); if (m_name.isEmpty()) emit(error("Name is empty")); - TEST(setAccuracy, accuracy); - TEST(setType, type); - TEST(setPowerPoints, powerPoints); + TEST(accuracy); + TEST(power); + TEST(type); + TEST(powerPoints); TEST_END(); } @@ -109,124 +110,41 @@ QDomElement Sigmod::Move::save() const return xml; } -void Sigmod::Move::setName(const QString& name) -{ - CHECK(name); -} - -void Sigmod::Move::setAccuracy(const Sigcore::Fraction& accuracy) -{ - if ((accuracy < 0) || (1 < accuracy)) - emit(error(bounds("accuracy", 0, 1, accuracy))); - else - CHECK(accuracy); -} - -void Sigmod::Move::setPower(const int power) -{ - CHECK(power); -} - -void Sigmod::Move::setType(const int type) -{ - if (!sigmod()->typeById(type)) - emit(error(bounds("type", type))); - else - CHECK(type); -} - -void Sigmod::Move::setSpecial(const bool special) -{ - CHECK(special); -} - -void Sigmod::Move::setPowerPoints(const int powerPoints) -{ - if (powerPoints <= 0) - emit(error(bounds("powerPoints", 1, INT_MAX, powerPoints))); - else - CHECK(powerPoints); -} - -void Sigmod::Move::setPriority(const int priority) -{ - CHECK(priority); -} - -void Sigmod::Move::setDescription(const QString& description) -{ - CHECK(description); -} - -void Sigmod::Move::setBattleScript(const Sigcore::Script& battleScript) -{ - CHECK(battleScript); -} - -void Sigmod::Move::setWorldScript(const Sigcore::Script& worldScript) -{ - CHECK(worldScript); -} - -void Sigmod::Move::setPriorityScript(const Sigcore::Script& priorityScript) -{ - CHECK(priorityScript); -} - -QString Sigmod::Move::name() const -{ - return m_name; -} - -Sigcore::Fraction Sigmod::Move::accuracy() const -{ - return m_accuracy; -} - -int Sigmod::Move::power() const -{ - return m_power; -} - -int Sigmod::Move::type() const -{ - return m_type; -} - -bool Sigmod::Move::special() const -{ - return m_special; -} - -int Sigmod::Move::powerPoints() const -{ - return m_powerPoints; -} - -int Sigmod::Move::priority() const -{ - return m_priority; -} - -QString Sigmod::Move::description() const -{ - return m_description; -} - -Sigcore::Script Sigmod::Move::battleScript() const -{ - return m_battleScript; -} - -Sigcore::Script Sigmod::Move::worldScript() const -{ - return m_worldScript; -} - -Sigcore::Script Sigmod::Move::priorityScript() const -{ - return m_priorityScript; -} +SETTER(Move, QString&, Name, name) +SETTER(Move, Sigcore::Fraction&, Accuracy, accuracy) +SETTER(Move, int, Power, power) +SETTER(Move, int, Type, type) +SETTER(Move, bool, Special, special) +SETTER(Move, int, PowerPoints, powerPoints) +SETTER(Move, int, Priority, priority) +SETTER(Move, QString&, Description, description) +SETTER(Move, Sigcore::Script&, BattleScript, battleScript) +SETTER(Move, Sigcore::Script&, WorldScript, worldScript) +SETTER(Move, Sigcore::Script&, PriorityScript, priorityScript) + +GETTER(Move, QString, name) +GETTER(Move, Sigcore::Fraction, accuracy) +GETTER(Move, int, power) +GETTER(Move, int, type) +GETTER(Move, bool, special) +GETTER(Move, int, powerPoints) +GETTER(Move, int, priority) +GETTER(Move, QString, description) +GETTER(Move, Sigcore::Script, battleScript) +GETTER(Move, Sigcore::Script, worldScript) +GETTER(Move, Sigcore::Script, priorityScript) + +CHECK(Move, QString&, name) +CHECK_BOUNDS(Move, Sigcore::Fraction&, accuracy, 0, 1) +CHECK_BOUNDS(Move, int, power, 0, INT_MAX) +CHECK_INDEX(Move, int, type, sigmod(), type) +CHECK(Move, bool, special) +CHECK_BOUNDS(Move, int, powerPoints, 1, INT_MAX) +CHECK(Move, int, priority) +CHECK(Move, QString&, description) +CHECK(Move, Sigcore::Script&, battleScript) +CHECK(Move, Sigcore::Script&, worldScript) +CHECK(Move, Sigcore::Script&, priorityScript) Sigmod::Move& Sigmod::Move::operator=(const Move& rhs) { |