From 6dd3d36c4552565756dcedab2ddd44e90a553252 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Thu, 19 Jun 2008 02:06:10 +0000 Subject: [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 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@212 6ecfd1a5-f3ed-3746-8530-beee90d26b22 --- pokemod/MapWildList.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'pokemod/MapWildList.cpp') diff --git a/pokemod/MapWildList.cpp b/pokemod/MapWildList.cpp index d08c84ce..1a05b1b4 100644 --- a/pokemod/MapWildList.cpp +++ b/pokemod/MapWildList.cpp @@ -19,6 +19,7 @@ #include "MapWildList.h" // Pokemod includes +#include "Macros.h" #include "Map.h" #include "MapWildListEncounter.h" @@ -56,18 +57,16 @@ Pokemod::MapWildList::~MapWildList() void Pokemod::MapWildList::validate() { + TEST_BEGIN(); if (m_name.isEmpty()) emit(error("Name is empty")); if (!encounterCount()) emit(error("There are no encounters")); QSet idChecker; - foreach (MapWildListEncounter* encounter, m_encounters) - { - encounter->validate(); - if (idChecker.contains(encounter->id())) - emit(error(subclass("encounter", encounter->id()))); - idChecker.insert(encounter->id()); - } + TEST_SUB_BEGIN(MapWildListEncounter, encounters); + TEST_SUB("encounter", id); + TEST_SUB_END(); + TEST_END(); } void Pokemod::MapWildList::load(const QDomElement& xml, int id) -- cgit