diff options
Diffstat (limited to 'pokemod/MapTrainer.cpp')
| -rw-r--r-- | pokemod/MapTrainer.cpp | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/pokemod/MapTrainer.cpp b/pokemod/MapTrainer.cpp index 66b3b99b..cd08037b 100644 --- a/pokemod/MapTrainer.cpp +++ b/pokemod/MapTrainer.cpp @@ -58,7 +58,7 @@ bool PokeGen::PokeMod::MapTrainer::Validate() pokemod->ValidationMsg("Skin could't be found"); isValid = false; } - if (DIR_End_None <= direction) + if (D_End_None <= direction) { pokemod->ValidationMsg("Invalid direction"); isValid = false; @@ -209,7 +209,7 @@ void PokeGen::PokeMod::MapTrainer::SetSight(const unsigned s) bool PokeGen::PokeMod::MapTrainer::SetDirection(const unsigned d) { - if (d < DIR_End_None) + if (d < D_End_None) direction = d; return (direction == d); } @@ -285,7 +285,7 @@ QString PokeGen::PokeMod::MapTrainer::GetName() const return name; } -PokeGen::PokeMod::Point PokeGen::PokeMod::MapTrainer::GetCoordinate() const +PokeGen::Point PokeGen::PokeMod::MapTrainer::GetCoordinate() const { return coordinate; } @@ -325,7 +325,7 @@ QString PokeGen::PokeMod::MapTrainer::GetAI() const return ai; } -PokeGen::PokeMod::Flag PokeGen::PokeMod::MapTrainer::GetAppearFlag() const +PokeGen::Flag PokeGen::PokeMod::MapTrainer::GetAppearFlag() const { return appearFlag; } @@ -385,11 +385,8 @@ unsigned PokeGen::PokeMod::MapTrainer::GetPokemonCount() const const PokeGen::PokeMod::MapTrainerPokemon* PokeGen::PokeMod::MapTrainer::NewPokemon(Ini* const ini) { unsigned i = 0; - for (; i < GetPokemonCount(); ++i) - { - if (GetPokemonByID(i) == UINT_MAX) - break; - } + for (; (i < GetPokemonCount()) && (GetPokemonByID(i) != UINT_MAX); ++i) + ; MapTrainerPokemon newPokemon(pokemod, i); if (ini) newPokemon.ImportIni(*ini); |