[FIX] Only committed general last time

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

1 files changed, 36 insertions, 36 deletions

diff --git a/pokemod/MapTrainerTeamMember.cpp b/pokemod/MapTrainerTeamMember.cpp
index b894b7d7..2895230e 100644
--- a/pokemod/MapTrainerTeamMember.cpp
+++ b/pokemod/MapTrainerTeamMember.cpp
@@ -27,21 +27,21 @@
 #include "Species.h"
 #include "MapTrainerTeamMember.h"
 
-MapTrainerTeamMember::MapTrainerTeamMember(const Pokemod& par, const unsigned _id) :
+MapTrainerTeamMember::MapTrainerTeamMember(const Pokemod& par, const int _id) :
         Object("MapTrainerTeamMember", par, _id),
-        species(UINT_MAX),
-        level(UINT_MAX),
-        nature(UINT_MAX)
+        species(-1),
+        level(-1),
+        nature(-1)
 {
 }
 
-MapTrainerTeamMember::MapTrainerTeamMember(const Pokemod& par, const MapTrainerTeamMember& t, const unsigned _id) :
+MapTrainerTeamMember::MapTrainerTeamMember(const Pokemod& par, const MapTrainerTeamMember& t, const int _id) :
         Object("MapTrainerTeamMember", par, _id)
 {
     *this = t;
 }
 
-MapTrainerTeamMember::MapTrainerTeamMember(const Pokemod& par, const QString& fname, const unsigned _id) :
+MapTrainerTeamMember::MapTrainerTeamMember(const Pokemod& par, const QString& fname, const int _id) :
         Object("MapTrainerTeamMember", par, _id)
 {
     load(fname, _id);
@@ -51,7 +51,7 @@ bool MapTrainerTeamMember::validate() const
 {
     bool valid = true;
     pokemod.validationMsg(QString("---------Team Member with id %1---").arg(id), Pokemod::V_Msg);
-    if (pokemod.getSpeciesIndex(species) == UINT_MAX)
+    if (pokemod.getSpeciesIndex(species) == -1)
     {
         pokemod.validationMsg("Invalid species");
         valid = false;
@@ -61,19 +61,19 @@ bool MapTrainerTeamMember::validate() const
         pokemod.validationMsg("Invalid level");
         valid = false;
     }
-    if (unsigned(items.size()) <= pokemod.getRules().getHoldItems())
+    if (items.size() <= pokemod.getRules().getHoldItems())
     {
-        QMap<unsigned, unsigned> idChecker;
-        for (QListIterator<unsigned> i(items); i.hasNext(); i.next())
+        QMap<int, int> idChecker;
+        for (QListIterator<int> i(items); i.hasNext(); i.next())
         {
-            if (pokemod.getItemIndex(i.peekNext()) == UINT_MAX)
+            if (pokemod.getItemIndex(i.peekNext()) == -1)
             {
                 pokemod.validationMsg("Invalid item");
                 valid = false;
             }
             ++idChecker[i.peekNext()];
         }
-        for (QMapIterator<unsigned, unsigned> i(idChecker); i.hasNext(); i.next())
+        for (QMapIterator<int, int> i(idChecker); i.hasNext(); i.next())
         {
             if (1 < i.value())
             {
@@ -89,7 +89,7 @@ bool MapTrainerTeamMember::validate() const
     }
     if (pokemod.getRules().getNatureAllowed())
     {
-        if (pokemod.getNatureIndex(nature) == UINT_MAX)
+        if (pokemod.getNatureIndex(nature) == -1)
         {
             pokemod.validationMsg("Invalid nature");
             valid = false;
@@ -98,24 +98,24 @@ bool MapTrainerTeamMember::validate() const
     return valid;
 }
 
-void MapTrainerTeamMember::load(const QString& fname, const unsigned _id) throw(Exception)
+void MapTrainerTeamMember::load(const QString& fname, const int _id) throw(Exception)
 {
     Ini ini(fname);
-    if (_id == UINT_MAX)
+    if (_id == -1)
         ini.getValue("id", id);
     else
         id = _id;
-    unsigned i;
-    unsigned j;
+    int i;
+    int j;
     items.clear();
     ini.getValue("species", species);
     ini.getValue("level", level);
     ini.getValue("nature", nature);
     ini.getValue("numItems", i, 0);
-    for (unsigned k = 0; k < i; ++k)
+    for (int k = 0; k < i; ++k)
     {
         ini.getValue(QString("item-%1").arg(k), j);
-        if (k != UINT_MAX)
+        if (k != -1)
             items.append(j);
     }
 }
@@ -127,31 +127,31 @@ void MapTrainerTeamMember::save(const QString& map, const QString& trainer) cons
     ini.addField("species", species);
     ini.addField("level", level);
     ini.addField("nature", nature);
-    ini.addField("numItems", unsigned(items.size()));
-    for (unsigned i = 0; i < unsigned(items.size()); ++i)
+    ini.addField("numItems", items.size());
+    for (int i = 0; i < items.size(); ++i)
         ini.addField(QString("item-%1").arg(i), items[i]);
     ini.save(QString("%1/map/%2/trainer/%3/team/%4.pini").arg(pokemod.getPath()).arg(map).arg(trainer).arg(id));
 }
 
-void MapTrainerTeamMember::setSpecies(const unsigned s) throw(BoundsException)
+void MapTrainerTeamMember::setSpecies(const int s) throw(BoundsException)
 {
-    if (pokemod.getSpeciesIndex(s) == UINT_MAX)
+    if (pokemod.getSpeciesIndex(s) == -1)
         throw(BoundsException(className, "species"));
     species = s;
 }
 
-void MapTrainerTeamMember::setLevel(const unsigned l) throw(BoundsException)
+void MapTrainerTeamMember::setLevel(const int l) throw(BoundsException)
 {
     if (pokemod.getRules().getMaxLevel() < l)
         throw(BoundsException(className, "level"));
     level = l;
 }
 
-void MapTrainerTeamMember::setItem(const unsigned itm, const bool it) throw(Exception)
+void MapTrainerTeamMember::setItem(const int itm, const bool it) throw(Exception)
 {
-    if (pokemod.getItemIndex(itm) == UINT_MAX)
-        throw(BoundsException("MpTrainerPokemon", "item"));
-    for (QMutableListIterator<unsigned> i(items); i.hasNext(); )
+    if (pokemod.getItemIndex(itm) == -1)
+        throw(BoundsException(className, "item"));
+    for (QMutableListIterator<int> i(items); i.hasNext(); )
     {
         if (i.next() == itm)
         {
@@ -163,36 +163,36 @@ void MapTrainerTeamMember::setItem(const unsigned itm, const bool it) throw(Exce
     }
     if (!it)
         throw(Exception(className, "item wasn\'t being used anyway"));
-    if (pokemod.getRules().getHoldItems() <= unsigned(items.size()))
+    if (pokemod.getRules().getHoldItems() <= items.size())
         throw(Exception(className, "too many items"));
     items.append(itm);
 }
 
-void MapTrainerTeamMember::setNature(const unsigned n) throw(BoundsException)
+void MapTrainerTeamMember::setNature(const int n) throw(BoundsException)
 {
-    if (!pokemod.getRules().getNatureAllowed() || (pokemod.getNatureIndex(n) == UINT_MAX))
+    if (!pokemod.getRules().getNatureAllowed() || (pokemod.getNatureIndex(n) == -1))
         throw(BoundsException(className, "nature"));
     nature = n;
 }
 
-unsigned MapTrainerTeamMember::getSpecies() const
+int MapTrainerTeamMember::getSpecies() const
 {
     return species;
 }
 
-unsigned MapTrainerTeamMember::getLevel() const
+int MapTrainerTeamMember::getLevel() const
 {
     return level;
 }
 
-unsigned MapTrainerTeamMember::getNature() const
+int MapTrainerTeamMember::getNature() const
 {
     return nature;
 }
 
-bool MapTrainerTeamMember::getItem(const unsigned itm) const
+bool MapTrainerTeamMember::getItem(const int itm) const
 {
-    for (QListIterator<unsigned> i(items); i.hasNext(); )
+    for (QListIterator<int> i(items); i.hasNext(); )
     {
         if (i.next() == itm)
             return true;