Redoing rev25

[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@27 6ecfd1a5-f3ed-3746-8530-beee90d26b22

1 files changed, 7 insertions, 7 deletions

diff --git a/pokemod/Move.cpp b/pokemod/Move.cpp
index f38a62b3..68749cac 100644
--- a/pokemod/Move.cpp
+++ b/pokemod/Move.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        pokemod/Move.cpp
-// Purpose:     Define a move that Pokémon can learn
+// Purpose:     Define a move that species can learn
 // Author:      Ben Boeckel
 // Modified by: Ben Boeckel
 // Created:     Sat May 26 2007 22:51:21
@@ -22,6 +22,9 @@
 
 #include "Move.h"
 
+const char* PokeGen::PokeMod::Move::TargetStr[PokeGen::PokeMod::Move::T_End] = {"Player", "Enemy", "Both", "Random"};
+const char* PokeGen::PokeMod::Move::ChoiceStr[PokeGen::PokeMod::Move::C_End] = {"Player", "Enemy", "Random"};
+
 PokeGen::PokeMod::Move::Move(const Pokemod* par, const unsigned _id) :
         Object(_id, par),
         name(""),
@@ -232,7 +235,7 @@ QString PokeGen::PokeMod::Move::GetName() const
     return name;
 }
 
-PokeGen::PokeMod::Frac PokeGen::PokeMod::Move::GetAccuracy() const
+PokeGen::Frac PokeGen::PokeMod::Move::GetAccuracy() const
 {
     return accuracy;
 }
@@ -322,11 +325,8 @@ unsigned PokeGen::PokeMod::Move::GetEffectCount() const
 const PokeGen::PokeMod::MoveEffect* PokeGen::PokeMod::Move::NewEffect(Ini* const ini)
 {
     unsigned i = 0;
-    for (; i < GetEffectCount(); ++i)
-    {
-        if (!GetEffect(i))
-            break;
-    }
+    for (; (i < GetEffectCount()) && (GetEffectByID(i) != UINT_MAX); ++i)
+        ;
     MoveEffect newEffect(pokemod, i);
     if (ini)
         newEffect.ImportIni(*ini);