[FIX] Players now have money

[FIX] Some more things added to Arena stuff
[FIX] Can now delete objects in the tree in Sigmodr
[FIX] Setting Sigmods as dirty is better now

git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@258 6ecfd1a5-f3ed-3746-8530-beee90d26b22

5 files changed, 62 insertions, 62 deletions

diff --git a/sigmod/CoinList.cpp b/sigmod/CoinList.cpp
index 47c360cf..a94406b6 100644
--- a/sigmod/CoinList.cpp
+++ b/sigmod/CoinList.cpp
@@ -228,6 +228,6 @@ Sigmod::CoinList& Sigmod::CoinList::operator=(const CoinList& rhs)
 
 void Sigmod::CoinList::clear()
 {
-    while (objectCount())
-        deleteObject(0);
+    qDeleteAll(m_objects);
+    m_objects.clear();
 }
diff --git a/sigmod/Map.cpp b/sigmod/Map.cpp
index 07509021..fe599cc6 100644
--- a/sigmod/Map.cpp
+++ b/sigmod/Map.cpp
@@ -562,12 +562,12 @@ Sigmod::Map& Sigmod::Map::operator=(const Map& rhs)
 
 void Sigmod::Map::clear()
 {
-    while (effectCount())
-        deleteEffect(0);
-    while (trainerCount())
-        deleteTrainer(0);
-    while (warpCount())
-        deleteWarp(0);
-    while (wildListCount())
-        deleteWildList(0);
+    qDeleteAll(m_effects);
+    m_effects.clear();
+    qDeleteAll(m_trainers);
+    m_trainers.clear();
+    qDeleteAll(m_warps);
+    m_warps.clear();
+    qDeleteAll(m_wildLists);
+    m_wildLists.clear();
 }
diff --git a/sigmod/MapWildList.cpp b/sigmod/MapWildList.cpp
index 502b87ee..1f8b9c17 100644
--- a/sigmod/MapWildList.cpp
+++ b/sigmod/MapWildList.cpp
@@ -185,6 +185,6 @@ Sigmod::MapWildList& Sigmod::MapWildList::operator=(const MapWildList& rhs)
 
 void Sigmod::MapWildList::clear()
 {
-    while (encounterCount())
-        deleteEncounter(0);
+    qDeleteAll(m_encounters);
+    m_encounters.clear();
 }
diff --git a/sigmod/Sigmod.cpp b/sigmod/Sigmod.cpp
index cebd5f8d..05149f9c 100644
--- a/sigmod/Sigmod.cpp
+++ b/sigmod/Sigmod.cpp
@@ -2197,48 +2197,48 @@ Sigmod::Sigmod& Sigmod::Sigmod::operator=(const Sigmod& rhs)
 
 void Sigmod::Sigmod::clear()
 {
-    while (abilityCount())
-        deleteAbility(0);
-    while (authorCount())
-        deleteAuthor(0);
-    while (badgeCount())
-        deleteBadge(0);
-    while (coinListCount())
-        deleteCoinList(0);
-    while (eggGroupCount())
-        deleteEggGroup(0);
-    while (globalScriptCount())
-        deleteGlobalScript(0);
-    while (itemCount())
-        deleteItem(0);
-    while (itemTypeCount())
-        deleteItemType(0);
-    while (mapCount())
-        deleteMap(0);
-    while (moveCount())
-        deleteMove(0);
-    while (natureCount())
-        deleteNature(0);
-    while (skinCount())
-        deleteSkin(0);
-    while (soundCount())
-        deleteSound(0);
-    while (speciesCount())
-        deleteSpecies(0);
-    while (spriteCount())
-        deleteSprite(0);
-    while (statusCount())
-        deleteStatus(0);
-    while (storeCount())
-        deleteStore(0);
-    while (tileCount())
-        deleteTile(0);
-    while (timeCount())
-        deleteTime(0);
-    while (trainerCount())
-        deleteTrainer(0);
-    while (typeCount())
-        deleteType(0);
-    while (weatherCount())
-        deleteWeather(0);
+    qDeleteAll(m_abilities);
+    m_abilities.clear();
+    qDeleteAll(m_authors);
+    m_authors.clear();
+    qDeleteAll(m_badges);
+    m_badges.clear();
+    qDeleteAll(m_coinLists);
+    m_coinLists.clear();
+    qDeleteAll(m_eggGroups);
+    m_eggGroups.clear();
+    qDeleteAll(m_globalScripts);
+    m_globalScripts.clear();
+    qDeleteAll(m_items);
+    m_items.clear();
+    qDeleteAll(m_itemTypes);
+    m_itemTypes.clear();
+    qDeleteAll(m_maps);
+    m_maps.clear();
+    qDeleteAll(m_moves);
+    m_moves.clear();
+    qDeleteAll(m_natures);
+    m_natures.clear();
+    qDeleteAll(m_skins);
+    m_skins.clear();
+    qDeleteAll(m_sounds);
+    m_sounds.clear();
+    qDeleteAll(m_species);
+    m_species.clear();
+    qDeleteAll(m_sprites);
+    m_sprites.clear();
+    qDeleteAll(m_status);
+    m_status.clear();
+    qDeleteAll(m_stores);
+    m_stores.clear();
+    qDeleteAll(m_tiles);
+    m_tiles.clear();
+    qDeleteAll(m_times);
+    m_times.clear();
+    qDeleteAll(m_trainers);
+    m_trainers.clear();
+    qDeleteAll(m_types);
+    m_types.clear();
+    qDeleteAll(m_weathers);
+    m_weathers.clear();
 }
diff --git a/sigmod/Species.cpp b/sigmod/Species.cpp
index 3fc72932..570004bc 100644
--- a/sigmod/Species.cpp
+++ b/sigmod/Species.cpp
@@ -852,10 +852,10 @@ Sigmod::Species& Sigmod::Species::operator=(const Species& rhs)
 
 void Sigmod::Species::clear()
 {
-    while (abilityCount())
-        deleteAbility(0);
-    while (itemCount())
-        deleteItem(0);
-    while (moveCount())
-        deleteMove(0);
+    qDeleteAll(m_abilities);
+    m_abilities.clear();
+    qDeleteAll(m_items);
+    m_items.clear();
+    qDeleteAll(m_moves);
+    m_moves.clear();
 }