summaryrefslogtreecommitdiffstats
path: root/pokemod/MapTrainerTeamMember.cpp
diff options
context:
space:
mode:
authorBen Boeckel <MathStuf@gmail.com>2008-01-23 04:50:24 +0000
committerBen Boeckel <MathStuf@gmail.com>2008-01-23 04:50:24 +0000
commitef250617e8163c535931be045aa4e9d59163ace7 (patch)
tree5b76323ec66a63c3fca589b088b310c3fdaba2b7 /pokemod/MapTrainerTeamMember.cpp
parentefa80ce427e40070e36e5ab86d2f6dbf4ad50648 (diff)
downloadsigen-ef250617e8163c535931be045aa4e9d59163ace7.tar.gz
sigen-ef250617e8163c535931be045aa4e9d59163ace7.tar.xz
sigen-ef250617e8163c535931be045aa4e9d59163ace7.zip
[FIX] Grammer in Changelog
[FIX] Made pokemod classes contain their names for later ease [ADD] PokéModr main window form [FIX] Ini and Exception includes fixed [FIX] BugCatcher bugs fixed [FIX] .pro files fixed [ADD] PokéModr main GUI almost complete git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@40 6ecfd1a5-f3ed-3746-8530-beee90d26b22
Diffstat (limited to 'pokemod/MapTrainerTeamMember.cpp')
-rw-r--r--pokemod/MapTrainerTeamMember.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/pokemod/MapTrainerTeamMember.cpp b/pokemod/MapTrainerTeamMember.cpp
index 45e84bb3..b894b7d7 100644
--- a/pokemod/MapTrainerTeamMember.cpp
+++ b/pokemod/MapTrainerTeamMember.cpp
@@ -28,7 +28,7 @@
#include "MapTrainerTeamMember.h"
MapTrainerTeamMember::MapTrainerTeamMember(const Pokemod& par, const unsigned _id) :
- Object(par, _id),
+ Object("MapTrainerTeamMember", par, _id),
species(UINT_MAX),
level(UINT_MAX),
nature(UINT_MAX)
@@ -36,13 +36,13 @@ MapTrainerTeamMember::MapTrainerTeamMember(const Pokemod& par, const unsigned _i
}
MapTrainerTeamMember::MapTrainerTeamMember(const Pokemod& par, const MapTrainerTeamMember& t, const unsigned _id) :
- Object(par, _id)
+ Object("MapTrainerTeamMember", par, _id)
{
*this = t;
}
MapTrainerTeamMember::MapTrainerTeamMember(const Pokemod& par, const QString& fname, const unsigned _id) :
- Object(par, _id)
+ Object("MapTrainerTeamMember", par, _id)
{
load(fname, _id);
}
@@ -136,14 +136,14 @@ void MapTrainerTeamMember::save(const QString& map, const QString& trainer) cons
void MapTrainerTeamMember::setSpecies(const unsigned s) throw(BoundsException)
{
if (pokemod.getSpeciesIndex(s) == UINT_MAX)
- throw(BoundsException("MapTrainerTeamMember", "species"));
+ throw(BoundsException(className, "species"));
species = s;
}
void MapTrainerTeamMember::setLevel(const unsigned l) throw(BoundsException)
{
if (pokemod.getRules().getMaxLevel() < l)
- throw(BoundsException("MapTrainerTeamMember", "level"));
+ throw(BoundsException(className, "level"));
level = l;
}
@@ -156,22 +156,22 @@ void MapTrainerTeamMember::setItem(const unsigned itm, const bool it) throw(Exce
if (i.next() == itm)
{
if (it)
- throw(Exception("MapTrainerTeamMember", "item already used"));
+ throw(Exception(className, "item already used"));
else
i.remove();
}
}
if (!it)
- throw(Exception("MapTrainerTeamMember", "item wasn\'t being used anyway"));
+ throw(Exception(className, "item wasn\'t being used anyway"));
if (pokemod.getRules().getHoldItems() <= unsigned(items.size()))
- throw(Exception("MapTrainerTeamMember", "too many items"));
+ throw(Exception(className, "too many items"));
items.append(itm);
}
void MapTrainerTeamMember::setNature(const unsigned n) throw(BoundsException)
{
if (!pokemod.getRules().getNatureAllowed() || (pokemod.getNatureIndex(n) == UINT_MAX))
- throw(BoundsException("MapTrainerTeamMember", "nature"));
+ throw(BoundsException(className, "nature"));
nature = n;
}