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/Trainer.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/Trainer.cpp')
| -rw-r--r-- | pokemod/Trainer.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pokemod/Trainer.cpp b/pokemod/Trainer.cpp index f5a6ecda..b82dbd1c 100644 --- a/pokemod/Trainer.cpp +++ b/pokemod/Trainer.cpp @@ -19,11 +19,9 @@ #include "Trainer.h" // Pokemod includes +#include "Macros.h" #include "Pokemod.h" -// Qt includes -#include <QBuffer> - const QStringList Pokemod::Trainer::IntelligenceStr = QStringList() << "Ignorant" << "Remember" << "Deduce" << "Cheating"; Pokemod::Trainer::Trainer(const Trainer& trainer) : @@ -54,10 +52,12 @@ Pokemod::Trainer::Trainer(const QDomElement& xml, const Pokemod* parent, const i void Pokemod::Trainer::validate() { + TEST_BEGIN(); if (m_name.isEmpty()) emit(error("Name is empty")); TEST(setMoneyFactor, moneyFactor); TEST(setSkin, skin); + TEST_END(); } void Pokemod::Trainer::load(const QDomElement& xml, int id) |