summaryrefslogtreecommitdiffstats
path: root/pokemod/MoveEffect.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/MoveEffect.cpp
parentefa80ce427e40070e36e5ab86d2f6dbf4ad50648 (diff)
[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/MoveEffect.cpp')
-rw-r--r--pokemod/MoveEffect.cpp24
1 files changed, 12 insertions, 12 deletions
diff --git a/pokemod/MoveEffect.cpp b/pokemod/MoveEffect.cpp
index 5fc53fc6..1da7ef6f 100644
--- a/pokemod/MoveEffect.cpp
+++ b/pokemod/MoveEffect.cpp
@@ -27,7 +27,7 @@
const QStringList MoveEffect::EffectStr = QStringList() << "Damage" << "Status" << "Confuse" << "Stat" << "StealHP" << "Counter" << "Selfdestruct" << "Need Status" << "Mirror" << "GetMoney" << "Never Miss" << "Steal Types" << "Clear Effects" << "Wait And Return" << "Self Confuse" << "Force Switch" << "Hit Multiple" << "Hit Multiple Turns" << "Flinch" << "One Hit K.O." << "Recoil" << "Recover" << "Rest" << "Sheild" << "Substitute" << "Recharge" << "Rage" << "Mimic" << "Random Move" << "Seed" << "Disable" << "Cut HM" << "Fly HM" << "Surf HM" << "Strength HM" << "Flash HM" << "Rock Smash HM" << "Rock Climb HM" << "Whirlpool HM" << "Waterfall HM" << "Share HP HM " << "Escape HM";
MoveEffect::MoveEffect(const Pokemod& par, const unsigned _id) :
- Object(par, _id),
+ Object("MoveEffect", par, _id),
chance(1, 1),
effect(UINT_MAX),
val1(UINT_MAX),
@@ -38,13 +38,13 @@ MoveEffect::MoveEffect(const Pokemod& par, const unsigned _id) :
}
MoveEffect::MoveEffect(const Pokemod& par, const MoveEffect& e, const unsigned _id) :
- Object(par, _id)
+ Object("MoveEffect", par, _id)
{
*this = e;
}
MoveEffect::MoveEffect(const Pokemod& par, const QString& fname, const unsigned _id) :
- Object(par, _id)
+ Object("MoveEffect", par, _id)
{
load(fname, _id);
}
@@ -114,7 +114,7 @@ void MoveEffect::setChanceDenom(const unsigned d) throw(Exception)
void MoveEffect::setEffect(const unsigned e) throw(BoundsException)
{
if (E_End <= e)
- throw(BoundsException("MoveEffect", "effect"));
+ throw(BoundsException(className, "effect"));
effect = e;
val1 = UINT_MAX;
val2 = UINT_MAX;
@@ -128,28 +128,28 @@ void MoveEffect::setVal1(const unsigned v1) throw(Exception)
{
case E_Damage:
if (D_End <= v1)
- throw(BoundsException("MoveEffect", "val1"));
+ throw(BoundsException(className, "val1"));
break;
case E_Status:
case E_NeedStatus:
if (STS_End <= v1)
- throw(BoundsException("MoveEffect", "val1"));
+ throw(BoundsException(className, "val1"));
throw;
case E_Stat:
if (ST_End_Battle <= v1)
- throw(BoundsException("MoveEffect", "val1"));
+ throw(BoundsException(className, "val1"));
break;
case E_Counter:
case E_Shield:
if (MT_End <= v1)
- throw(BoundsException("MoveEffect", "val1"));
+ throw(BoundsException(className, "val1"));
break;
case E_Recoil:
if (R_End <= v1)
- throw(BoundsException("MoveEffect", "val1"));
+ throw(BoundsException(className, "val1"));
break;
default:
- throw(BoundsException("MoveEffect", "val1"));
+ throw(BoundsException(className, "val1"));
break;
}
val1 = v1;
@@ -161,10 +161,10 @@ void MoveEffect::setVal2(const unsigned v2) throw(Exception)
{
case E_Damage:
if ((D_Level <= val1) || !v2)
- throw(BoundsException("MoveEffect", "val2"));
+ throw(BoundsException(className, "val2"));
break;
default:
- throw(BoundsException("MoveEffect", "val2"));
+ throw(BoundsException(className, "val2"));
break;
}
val2 = v2;