diff options
| author | Ben Boeckel <MathStuf@gmail.com> | 2008-12-25 07:53:09 -0500 |
|---|---|---|
| committer | Ben Boeckel <MathStuf@gmail.com> | 2008-12-25 07:53:09 -0500 |
| commit | f3b3f21d3ba0fd48bc265684817cb38a70adf84b (patch) | |
| tree | ccffe66f71e3ee15166080cda2aca7d842f547a2 /sigmod/MapTrainerTeamMember.cpp | |
| parent | e88f1843d61fd0d4c02fa85c3444c786f8c8fd8d (diff) | |
| download | sigen-f3b3f21d3ba0fd48bc265684817cb38a70adf84b.tar.gz sigen-f3b3f21d3ba0fd48bc265684817cb38a70adf84b.tar.xz sigen-f3b3f21d3ba0fd48bc265684817cb38a70adf84b.zip | |
Bounds errors are verbose now and some unchecked conditions fixed as well
Diffstat (limited to 'sigmod/MapTrainerTeamMember.cpp')
| -rw-r--r-- | sigmod/MapTrainerTeamMember.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sigmod/MapTrainerTeamMember.cpp b/sigmod/MapTrainerTeamMember.cpp index 3a72811e..dfeb84f8 100644 --- a/sigmod/MapTrainerTeamMember.cpp +++ b/sigmod/MapTrainerTeamMember.cpp @@ -102,15 +102,15 @@ QDomElement Sigmod::MapTrainerTeamMember::save() const void Sigmod::MapTrainerTeamMember::setSpecies(const int species) { if (!sigmod()->speciesById(species)) - emit(error(bounds("species"))); + emit(error(bounds("species", species))); else CHECK(species); } void Sigmod::MapTrainerTeamMember::setLevel(const int level) { - if (sigmod()->rules()->maxLevel() < level) - emit(error(bounds("level"))); + if ((level <= 0) || (sigmod()->rules()->maxLevel() < level)) + emit(error(bounds("level", 0, sigmod()->rules()->maxLevel(), level))); else CHECK(level); } @@ -118,7 +118,7 @@ void Sigmod::MapTrainerTeamMember::setLevel(const int level) void Sigmod::MapTrainerTeamMember::setAbility(const int ability, const bool state) { if (!sigmod()->abilityById(ability)) - emit(error(bounds("ability"))); + emit(error(bounds("ability", ability))); else if (state && !m_ability.contains(ability)) { if (m_ability.size() < sigmod()->rules()->maxAbilities()) @@ -139,7 +139,7 @@ void Sigmod::MapTrainerTeamMember::setAbility(const int ability, const bool stat void Sigmod::MapTrainerTeamMember::setItem(const int item, const bool state) { if (!sigmod()->itemById(item)) - emit(error(bounds("item"))); + emit(error(bounds("item", item))); else if (state && !m_item.contains(item)) { if (m_item.size() < sigmod()->rules()->maxHeldItems()) @@ -165,7 +165,7 @@ void Sigmod::MapTrainerTeamMember::setItem(const int item, const bool state) void Sigmod::MapTrainerTeamMember::setMove(const int move, const bool state) { if (!sigmod()->moveById(move)) - emit(error(bounds("move"))); + emit(error(bounds("move", move))); else if (state && !m_move.contains(move)) { const Species* species = sigmod()->speciesById(move); @@ -196,7 +196,7 @@ void Sigmod::MapTrainerTeamMember::setMove(const int move, const bool state) void Sigmod::MapTrainerTeamMember::setNature(const int nature, const bool state) { if (!sigmod()->natureById(nature)) - emit(error(bounds("nature"))); + emit(error(bounds("nature", nature))); else if (state && !m_nature.contains(nature)) { if (m_nature.size() < sigmod()->rules()->maxNatures()) |