From c9afda3ab74614fb36986f96b7972c082f275eca Mon Sep 17 00:00:00 2001
From: Ben Boeckel <MathStuf@gmail.com>
Date: Sat, 2 Jun 2007 18:12:48 +0000
Subject: Finished off all PokeMod classes, added move validations, fixed up
 some GUI, various other fixes

git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@18 6ecfd1a5-f3ed-3746-8530-beee90d26b22
---
 pokemod/MapTrainerTeam.cpp | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

(limited to 'pokemod/MapTrainerTeam.cpp')

diff --git a/pokemod/MapTrainerTeam.cpp b/pokemod/MapTrainerTeam.cpp
index 376e887f..bd7c59d6 100644
--- a/pokemod/MapTrainerTeam.cpp
+++ b/pokemod/MapTrainerTeam.cpp
@@ -25,12 +25,12 @@
 
 extern PokeGen::PokeMod::Pokemod curPokeMod;
 
-PokeGen::PokeMod::MapTrainerTeam::MapTrainerTeam(const unsigned _id)
+PokeGen::PokeMod::MapTrainerTeam::MapTrainerTeam(const unsigned _id) :
+   species(UINT_MAX),
+   level(1),
+   item(UINT_MAX)
 {
    LogCtor("MapTrainerTeam", _id);
-   species = -1;
-   level = 1;
-   item = -1;
    id = _id;
 }
 
@@ -60,7 +60,7 @@ void PokeGen::PokeMod::MapTrainerTeam::Validate()
       LogOutOfRange("MapTrainerTeam", id, "level", level, GetSpeciesString());
       isValid = false;
    }
-   if ((item != -1) && !curPokeMod.GetItem(item))
+   if (!curPokeMod.GetItem(item))
    {
       LogVarNotValid("MapTrainerTeam", id, "item");
       isValid = false;
@@ -84,7 +84,7 @@ void PokeGen::PokeMod::MapTrainerTeam::Validate(const wxListBox &output)
       output.Append(ConsoleLogVarOutOfRange("MapTrainerTeam", id, "level", level, GetSpeciesString()));
       isValid = false;
    }
-   if ((item != -1) && !curPokeMod.GetItem(item))
+   if (!curPokeMod.GetItem(item))
    {
       LogVarNotValid("MapTrainerTeam", id, "item", item);
       output.Append(ConsoleLogVarNotValid("MapTrainerTeam", id, "item", item));
@@ -99,16 +99,16 @@ void PokeGen::PokeMod::MapTrainerTeam::ImportIni(Ini &ini, const unsigned _id)
    LogImportStart("MapTrainerTeam");
    if (_id == UINT_MAX)
    {
-      ini.GetValue("id", id, UINT_MAX);
+      ini.GetValue("id", id);
       // Was there an id associated with the element?
       if (id == UINT_MAX)
          LogIdNotFound("MapTrainerTeam");
    }
    else
       id = _id;
-   ini.GetValue("species", species, -1);
+   ini.GetValue("species", species);
    ini.GetValue("level", level, 1);
-   ini.GetValue("item", item, -1);
+   ini.GetValue("item", item);
    LogImportOver("MapTrainerTeam", id);
 }
 
@@ -125,7 +125,7 @@ void PokeGen::PokeMod::MapTrainerTeam::ExportIni(std::ofstream &fout, const Stri
    LogExportOver("MapTrainerTeam", id);
 }
 
-void PokeGen::PokeMod::MapTrainerTeam::SetSpecies(const int s)
+void PokeGen::PokeMod::MapTrainerTeam::SetSpecies(const unsigned s)
 {
    LogSetVar("MapTrainerTeam", id, "species", s);
    if (curPokeMod.GetPokemon(s))
@@ -135,7 +135,7 @@ void PokeGen::PokeMod::MapTrainerTeam::SetSpecies(const int s)
 void PokeGen::PokeMod::MapTrainerTeam::SetSpecies(const String &s)
 {
    LogSetVar("MapTrainerTeam", id, "species string", s);
-   if (Pokemon *p = curPokeMod.GetPokemon(s))
+   if (const Pokemon *p = curPokeMod.GetPokemon(s))
       species = p->GetId();
 }
 
@@ -146,7 +146,7 @@ void PokeGen::PokeMod::MapTrainerTeam::SetLevel(const unsigned l)
       level = l;
 }
 
-void PokeGen::PokeMod::MapTrainerTeam::SetItem(const int i)
+void PokeGen::PokeMod::MapTrainerTeam::SetItem(const unsigned i)
 {
    LogSetVar("MapTrainerTeam", id, "item", i, GetSpeciesString());
    if (curPokeMod.GetItem(i))
@@ -156,11 +156,11 @@ void PokeGen::PokeMod::MapTrainerTeam::SetItem(const int i)
 void PokeGen::PokeMod::MapTrainerTeam::SetItem(const String &i)
 {
    LogSetVar("MapTrainerTeam", id, "item string", i, GetSpeciesString());
-   if (Item *temp = curPokeMod.GetItem(i))
+   if (const Item *temp = curPokeMod.GetItem(i))
       item = temp->GetId();
 }
 
-int PokeGen::PokeMod::MapTrainerTeam::GetSpecies() const
+unsigned PokeGen::PokeMod::MapTrainerTeam::GetSpecies() const
 {
    LogFetchVar("MapTrainerTeam", id, "speceis", species);
    return species;
@@ -169,7 +169,7 @@ int PokeGen::PokeMod::MapTrainerTeam::GetSpecies() const
 PokeGen::PokeMod::String PokeGen::PokeMod::MapTrainerTeam::GetSpeciesString() const
 {
    LogFetchVar("MapTrainerTeam", id, "species string", species);
-   if (Pokemon *p = curPokeMod.GetPokemon(species))
+   if (const Pokemon *p = curPokeMod.GetPokemon(species))
       return p->GetName();
    return "";
 }
@@ -180,7 +180,7 @@ unsigned PokeGen::PokeMod::MapTrainerTeam::GetLevel() const
    return level;
 }
 
-int PokeGen::PokeMod::MapTrainerTeam::GetItem() const
+unsigned PokeGen::PokeMod::MapTrainerTeam::GetItem() const
 {
    LogFetchVar("MapTrainerTeam", id, "item", item, GetSpeciesString());
    return item;
@@ -189,7 +189,7 @@ int PokeGen::PokeMod::MapTrainerTeam::GetItem() const
 PokeGen::PokeMod::String PokeGen::PokeMod::MapTrainerTeam::GetItemString() const
 {
    LogFetchVar("MapTrainerTeam", id, "item string", item, GetSpeciesString());
-   if (Item *i = curPokeMod.GetItem(item))
+   if (const Item *i = curPokeMod.GetItem(item))
       i->GetName();
    return "";
 }
-- 
cgit