[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

1 files changed, 2 insertions, 5 deletions

diff --git a/pokemod/Item.cpp b/pokemod/Item.cpp
index b0892600..47d0f401 100644
--- a/pokemod/Item.cpp
+++ b/pokemod/Item.cpp
@@ -185,11 +185,8 @@ unsigned PokeGen::PokeMod::Item::GetEffectCount() const
 const PokeGen::PokeMod::ItemEffect* PokeGen::PokeMod::Item::NewEffect(Ini* const ini)
 {
     unsigned i = 0;
-    for (; i < GetEffectCount(); ++i)
-    {
-        if (GetEffectByID(i) == UINT_MAX)
-            break;
-    }
+    for (; (i < GetEffectCount()) && (GetEffectByID(i) != UINT_MAX); ++i)
+        ;
     ItemEffect newEffect(pokemod, i);
     if (ini)
         newEffect.ImportIni(*ini);