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/MapEffect.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'pokemod/MapEffect.cpp') diff --git a/pokemod/MapEffect.cpp b/pokemod/MapEffect.cpp index df59f432..e731a2af 100644 --- a/pokemod/MapEffect.cpp +++ b/pokemod/MapEffect.cpp @@ -28,7 +28,7 @@ const QStringList MapEffect::MapEffectStr = QStringList() << "Item" << "PC" << " const QStringList MapEffect::PCTypeStr = QStringList() << "Item" << "Pokémon" << "PokéDex" << "Hall of Fame" << "All"; MapEffect::MapEffect(const Pokemod& par, const unsigned _id) : - Object(par, _id), + Object("MapEffect", par, _id), name(""), coordinate(0, 0), existFlag(0, 0), @@ -44,13 +44,13 @@ MapEffect::MapEffect(const Pokemod& par, const unsigned _id) : } MapEffect::MapEffect(const Pokemod& par, const MapEffect& e, const unsigned _id) : - Object(par, _id) + Object("MapEffect", par, _id) { *this = e; } MapEffect::MapEffect(const Pokemod& par, const QString& fname, const unsigned _id) : - Object(par, _id) + Object("MapEffect", par, _id) { load(fname, _id); } @@ -201,14 +201,14 @@ void MapEffect::setExistFlagStatus(const unsigned s) void MapEffect::setSkin(const QString& s) throw(Exception) { if (!QFile::exists(QString("%1/image/skin/%2.png").arg(pokemod.getPath()).arg(s))) - throw(Exception("MapEffect", "skin does not exist")); + throw(Exception(className, "skin does not exist")); skin = s; } void MapEffect::setEffect(const unsigned e) throw(BoundsException) { if (E_End <= e) - throw(BoundsException("MapEffect", "effect")); + throw(BoundsException(className, "effect")); effect = e; val1 = UINT_MAX; val2 = UINT_MAX; @@ -217,7 +217,7 @@ void MapEffect::setEffect(const unsigned e) throw(BoundsException) void MapEffect::setVal1(const unsigned v1) throw(UnusedException) { if ((effect != E_StrengthBlock) && (effect != E_Button)) - throw(UnusedException("MapEffect", "val1")); + throw(UnusedException(className, "val1")); val1 = v1; } @@ -227,19 +227,19 @@ void MapEffect::setVal2(const unsigned v2) throw(Exception) { case E_Item: if (pokemod.getItemIndex(val2) == UINT_MAX) - throw(BoundsException("MapEffect", "val2")); + throw(BoundsException(className, "val2")); break; case E_PC: if (PC_End <= val2) - throw(BoundsException("MapEffect", "val2")); + throw(BoundsException(className, "val2")); break; case E_StrengthBlock: case E_Button: if (Flag::End <= val2) - throw(BoundsException("MapEffect", "val2")); + throw(BoundsException(className, "val2")); break; default: - throw(UnusedException("MapEffect", "val2")); + throw(UnusedException(className, "val2")); break; } val2 = v2; @@ -248,7 +248,7 @@ void MapEffect::setVal2(const unsigned v2) throw(Exception) void MapEffect::setDirection(const unsigned d) throw(BoundsException) { if (D_End_None <= d) - throw(BoundsException("MapEffect", "direction")); + throw(BoundsException(className, "direction")); direction = d; } @@ -265,7 +265,7 @@ void MapEffect::setCanMove(const bool c) void MapEffect::setDialog(const unsigned d) throw(BoundsException) { if (pokemod.getDialogIndex(d) == UINT_MAX) - throw(BoundsException("MapEffect", "dialog")); + throw(BoundsException(className, "dialog")); dialog = d; } -- cgit