diff options
| author | Ben Boeckel <MathStuf@gmail.com> | 2007-10-26 20:46:09 +0000 |
|---|---|---|
| committer | Ben Boeckel <MathStuf@gmail.com> | 2007-10-26 20:46:09 +0000 |
| commit | 4385af885daf460a18e236f08509358f764b2c8c (patch) | |
| tree | 6c2838312dd7f42769280e24e8abc16b53c165cb /pokemod/CoinListObject.cpp | |
| parent | 1f08afc80c73087bf9bde639754670548b89fc9f (diff) | |
Reverted repo back to rev24 because committing of rev25 messed up
git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@26 6ecfd1a5-f3ed-3746-8530-beee90d26b22
Diffstat (limited to 'pokemod/CoinListObject.cpp')
| -rw-r--r-- | pokemod/CoinListObject.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/pokemod/CoinListObject.cpp b/pokemod/CoinListObject.cpp index d3a45d7b..1a59c40a 100644 --- a/pokemod/CoinListObject.cpp +++ b/pokemod/CoinListObject.cpp @@ -22,8 +22,6 @@ #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), @@ -52,9 +50,9 @@ bool PokeGen::PokeMod::CoinListObject::Validate() } else if (type == Pokemon) { - if (pokemod->GetSpeciesByID(object) == UINT_MAX) + if (pokemod->GetPokemonByID(object) == UINT_MAX) { - pokemod->ValidationMsg("Invalid Species"); + pokemod->ValidationMsg("Invalid Pokémon"); isValid = false; } } @@ -106,7 +104,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->GetSpeciesByID(o) != UINT_MAX))) + if (((type == Item) && (pokemod->GetItemByID(o) != UINT_MAX)) || ((type == Pokemon) && (pokemod->GetPokemonByID(o) != UINT_MAX))) object = o; return (object == o); } |