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/CoinListObject.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'pokemod/CoinListObject.cpp') diff --git a/pokemod/CoinListObject.cpp b/pokemod/CoinListObject.cpp index 1a59c40a..d3a45d7b 100644 --- a/pokemod/CoinListObject.cpp +++ b/pokemod/CoinListObject.cpp @@ -22,6 +22,8 @@ #include "CoinListObject.h" +const char* PokeGen::PokeMod::CoinListObject::TypeStr[PokeGen::PokeMod::CoinListObject::End] = {"Item", "Pokémon"}; + PokeGen::PokeMod::CoinListObject::CoinListObject(const Pokemod* par, const unsigned _id) : Object(_id, par), type(Item), @@ -50,9 +52,9 @@ bool PokeGen::PokeMod::CoinListObject::Validate() } else if (type == Pokemon) { - if (pokemod->GetPokemonByID(object) == UINT_MAX) + if (pokemod->GetSpeciesByID(object) == UINT_MAX) { - pokemod->ValidationMsg("Invalid Pokémon"); + pokemod->ValidationMsg("Invalid Species"); isValid = false; } } @@ -104,7 +106,7 @@ bool PokeGen::PokeMod::CoinListObject::SetType(const unsigned t) bool PokeGen::PokeMod::CoinListObject::SetObject(const unsigned o) { - if (((type == Item) && (pokemod->GetItemByID(o) != UINT_MAX)) || ((type == Pokemon) && (pokemod->GetPokemonByID(o) != UINT_MAX))) + if (((type == Item) && (pokemod->GetItemByID(o) != UINT_MAX)) || ((type == Pokemon) && (pokemod->GetSpeciesByID(o) != UINT_MAX))) object = o; return (object == o); } -- cgit