diff options
| author | Ben Boeckel <MathStuf@gmail.com> | 2008-06-19 02:06:10 +0000 |
|---|---|---|
| committer | Ben Boeckel <MathStuf@gmail.com> | 2008-06-19 02:06:10 +0000 |
| commit | 6dd3d36c4552565756dcedab2ddd44e90a553252 (patch) | |
| tree | 85fce9e5b97bd3a5f9f60b8d427ca8155d76609f /pokemod/MapTrainerTeamMember.cpp | |
| parent | 5d7d71ddb75f636f94028da346f43565ffb798df (diff) | |
| download | sigen-6dd3d36c4552565756dcedab2ddd44e90a553252.tar.gz sigen-6dd3d36c4552565756dcedab2ddd44e90a553252.tar.xz sigen-6dd3d36c4552565756dcedab2ddd44e90a553252.zip | |
[FIX] Validation works in Pokémodr
[FIX] Macros moved to their own file
[FIX] Macros for subclasses added
[FIX] Key shortcuts added to context menu items
[FIX] Rules had a redundant field
git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@212 6ecfd1a5-f3ed-3746-8530-beee90d26b22
Diffstat (limited to 'pokemod/MapTrainerTeamMember.cpp')
| -rw-r--r-- | pokemod/MapTrainerTeamMember.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pokemod/MapTrainerTeamMember.cpp b/pokemod/MapTrainerTeamMember.cpp index 1085f1b1..921de3c8 100644 --- a/pokemod/MapTrainerTeamMember.cpp +++ b/pokemod/MapTrainerTeamMember.cpp @@ -20,6 +20,7 @@ // Pokemod includes #include "Item.h" +#include "Macros.h" #include "MapTrainer.h" #include "Pokemod.h" #include "Rules.h" @@ -56,6 +57,7 @@ Pokemod::MapTrainerTeamMember::MapTrainerTeamMember(const QDomElement& xml, cons void Pokemod::MapTrainerTeamMember::validate() { + TEST_BEGIN(); TEST(setSpecies, species); TEST(setLevel, level); if (static_cast<const Pokemod*>(pokemod())->rules()->maxAbilities() < m_ability.size()) @@ -70,6 +72,7 @@ void Pokemod::MapTrainerTeamMember::validate() if (static_cast<const Pokemod*>(pokemod())->rules()->maxNatures() < m_nature.size()) emit(error("Too many natures")); TEST_LIST(setNature, nature); + TEST_END(); } void Pokemod::MapTrainerTeamMember::load(const QDomElement& xml, int id) |