From 1f08afc80c73087bf9bde639754670548b89fc9f Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Fri, 26 Oct 2007 20:01:48 +0000 Subject: [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 --- pokemod/MapWildListPokemon.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pokemod/MapWildListPokemon.cpp') diff --git a/pokemod/MapWildListPokemon.cpp b/pokemod/MapWildListPokemon.cpp index 896dcdf4..92dc3112 100644 --- a/pokemod/MapWildListPokemon.cpp +++ b/pokemod/MapWildListPokemon.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: pokemod/MapWildListPokemon.cpp -// Purpose: Define a Pokémon that can be found in the wild +// Purpose: Define a species that can be found in the wild // Author: Ben Boeckel // Modified by: Ben Boeckel // Created: Tue Mar 20 18:50:59 2007 @@ -39,7 +39,7 @@ PokeGen::PokeMod::MapWildListPokemon::MapWildListPokemon(const Pokemod* par, Ini bool PokeGen::PokeMod::MapWildListPokemon::Validate() { pokemod->ValidationMsg(QString("---------Pokémon with id %1---").arg(id), Pokemod::V_Msg); - if (pokemod->GetPokemonByID(species) == UINT_MAX) + if (pokemod->GetSpeciesByID(species) == UINT_MAX) { pokemod->ValidationMsg("Invalid species"); isValid = false; @@ -80,7 +80,7 @@ void PokeGen::PokeMod::MapWildListPokemon::ExportIni(QFile& fout, const QString& bool PokeGen::PokeMod::MapWildListPokemon::SetSpecies(const unsigned s) { - if (pokemod->GetPokemonByID(s) != UINT_MAX) + if (pokemod->GetSpeciesByID(s) != UINT_MAX) { species = s; return true; -- cgit