From ef250617e8163c535931be045aa4e9d59163ace7 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Wed, 23 Jan 2008 04:50:24 +0000 Subject: [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 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@40 6ecfd1a5-f3ed-3746-8530-beee90d26b22 --- pokemod/Map.cpp | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'pokemod/Map.cpp') diff --git a/pokemod/Map.cpp b/pokemod/Map.cpp index e3d90465..a57d58fd 100644 --- a/pokemod/Map.cpp +++ b/pokemod/Map.cpp @@ -30,7 +30,7 @@ const QStringList Map::TypeStr = QStringList() << "Outdoor" << "Dungeon" << "Building"; Map::Map(const Pokemod& par, const unsigned _id) : - Object(par, _id), + Object("Map", par, _id), name(""), flyWarp(UINT_MAX), type(UINT_MAX) @@ -38,13 +38,13 @@ Map::Map(const Pokemod& par, const unsigned _id) : } Map::Map(const Pokemod& par, const Map& m, const unsigned _id) : - Object(par, _id) + Object("Map", par, _id) { *this = m; } Map::Map(const Pokemod& par, const QString& fname, const unsigned _id) : - Object(par, _id) + Object("Map", par, _id) { load(fname, _id); } @@ -344,14 +344,14 @@ void Map::setName(const QString& n) void Map::setFlyWarp(const unsigned f) throw(BoundsException) { if (getWarpIndex(f) == UINT_MAX) - throw(BoundsException("Map", "warp")); + throw(BoundsException(className, "warp")); flyWarp = f; } void Map::setType(const unsigned t) throw(BoundsException) { if (End <= t) - throw(BoundsException("Map", "type")); + throw(BoundsException(className, "type")); type = t; } @@ -373,7 +373,7 @@ unsigned Map::getType() const void Map::setTile(unsigned x, unsigned y, unsigned _id) throw(BoundsException) { if (pokemod.getTileIndex(_id) == UINT_MAX) - throw(BoundsException("Map", "tile")); + throw(BoundsException(className, "tile")); tiles(x, y) = _id; } @@ -425,14 +425,14 @@ unsigned Map::getHeight() const const MapEffect& Map::getEffect(const unsigned i) const throw(IndexException) { if (getEffectCount() <= i) - throw(IndexException("Map")); + throw(IndexException(className)); return effects.at(i); } MapEffect& Map::getEffect(const unsigned i) throw(IndexException) { if (getEffectCount() <= i) - throw(IndexException("Map")); + throw(IndexException(className)); return effects[i]; } @@ -482,21 +482,21 @@ MapEffect& Map::newEffect(const MapEffect& e) void Map::deleteEffect(const unsigned i) throw(IndexException) { if (getEffectCount() <= i) - throw(IndexException("Map")); + throw(IndexException(className)); effects.removeAt(i); } const MapTrainer& Map::getTrainer(const unsigned i) const throw(IndexException) { if (getTrainerCount() <= i) - throw(IndexException("Map")); + throw(IndexException(className)); return trainers.at(i); } MapTrainer& Map::getTrainer(const unsigned i) throw(IndexException) { if (getTrainerCount() <= i) - throw(IndexException("Map")); + throw(IndexException(className)); return trainers[i]; } @@ -546,21 +546,21 @@ MapTrainer& Map::newTrainer(const MapTrainer& t) void Map::deleteTrainer(const unsigned i) throw(IndexException) { if (getTrainerCount() <= i) - throw(IndexException("Map")); + throw(IndexException(className)); trainers.removeAt(i); } const MapWarp& Map::getWarp(const unsigned i) const throw(IndexException) { if (getWarpCount() <= i) - throw(IndexException("Map")); + throw(IndexException(className)); return warps.at(i); } MapWarp& Map::getWarp(const unsigned i) throw(IndexException) { if (getWarpCount() <= i) - throw(IndexException("Map")); + throw(IndexException(className)); return warps[i]; } @@ -610,21 +610,21 @@ MapWarp& Map::newWarp(const MapWarp& w) void Map::deleteWarp(const unsigned i) throw(IndexException) { if (getWarpCount() <= i) - throw(IndexException("Map")); + throw(IndexException(className)); warps.removeAt(i); } const MapWildList& Map::getWildList(const unsigned i) const throw(IndexException) { if (getWildListCount() <= i) - throw(IndexException("Map")); + throw(IndexException(className)); return wildLists.at(i); } MapWildList& Map::getWildList(const unsigned i) throw(IndexException) { if (getWildListCount() <= i) - throw(IndexException("Map")); + throw(IndexException(className)); return wildLists[i]; } @@ -674,7 +674,7 @@ MapWildList& Map::newWildList(const MapWildList& w) void Map::deleteWildList(const unsigned i) throw(IndexException) { if (getWildListCount() <= i) - throw(IndexException("Map")); + throw(IndexException(className)); wildLists.removeAt(i); } -- cgit