summaryrefslogtreecommitdiffstats
path: root/pokemod/MoveEffect.cpp
diff options
context:
space:
mode:
authorBen Boeckel <MathStuf@gmail.com>2007-10-26 20:01:48 +0000
committerBen Boeckel <MathStuf@gmail.com>2007-10-26 20:01:48 +0000
commit1f08afc80c73087bf9bde639754670548b89fc9f (patch)
tree70a80d7998d9279a75509fed14238b3ba493e9eb /pokemod/MoveEffect.cpp
parent5b55d13ead7e352ee1feaae72009e8abf5bd071a (diff)
[ADD] DISCLAIMER
[FIX] PokemonEvolution styles [ADD] Relative enumeration [DEL] pokemod/Status.{h, cpp} [DEL] pokemod/StatusEffect.{h, cpp} [FIX] Status effects will be added as needed instead of customized [FIX] Completed ItemEffects [FIX] Factored out Natures to be global [DEL] pokemod/PokemonNature.{h, cpp} [DEL] ai/Net.{h, cpp} [DEL] ai/Layer/{h, cpp} [ADD] battle/Arena.{h, cpp} [ADD] battle/Team.{h, cpp} [ADD] battle/Human.{h, cpp} [ADD] battle/Bot.{h, cpp} [ADD] battle/GhostBot.{h, cpp} [ADD] battle/Pokemon.{h, cpp} [ADD] battle/Ghost.{h, cpp} [FIX] Fixed some scope errors in pokemod [ADD] audio/audio.pro [ADD] audio/Audio.{h, cpp} [ADD] audio/AudioLibrary.{h, cpp} [ADD] audio/AudioSystem.{h, cpp} [ADD] audio/Music.{h, cpp} [ADD] audio/SoundEffect.{h, cpp} [DEL] old audio system (was in C) [FIX] Optimized some routines in pokemod [FIX] Moved global classes (Ini, Frac, Matrix, FracMatrix, Point, Flag) to general git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@25 6ecfd1a5-f3ed-3746-8530-beee90d26b22
Diffstat (limited to 'pokemod/MoveEffect.cpp')
-rw-r--r--pokemod/MoveEffect.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/pokemod/MoveEffect.cpp b/pokemod/MoveEffect.cpp
index 4ceedbb8..7a8a5aca 100644
--- a/pokemod/MoveEffect.cpp
+++ b/pokemod/MoveEffect.cpp
@@ -22,6 +22,8 @@
#include "MoveEffect.h"
+const char* PokeGen::PokeMod::MoveEffect::EffectStr[PokeGen::PokeMod::MoveEffect::E_End] = {};
+
PokeGen::PokeMod::MoveEffect::MoveEffect(const Pokemod* par, const unsigned _id) :
Object(_id, par),
chance(1, 1),
@@ -98,7 +100,6 @@ bool PokeGen::PokeMod::MoveEffect::SetEffect(const unsigned e)
return (effect == e);
}
-// TODO (Ben#1#): Effect code
bool PokeGen::PokeMod::MoveEffect::SetVal1(const int v1)
{
val1 = v1;
@@ -111,7 +112,7 @@ bool PokeGen::PokeMod::MoveEffect::SetVal2(const unsigned v2)
return (val2 == v2);
}
-PokeGen::PokeMod::Frac PokeGen::PokeMod::MoveEffect::GetChance() const
+PokeGen::Frac PokeGen::PokeMod::MoveEffect::GetChance() const
{
return chance;
}