diff options
Diffstat (limited to 'pokemod/Tile.cpp')
| -rw-r--r-- | pokemod/Tile.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/pokemod/Tile.cpp b/pokemod/Tile.cpp index 6068f7d1..28b9ee84 100644 --- a/pokemod/Tile.cpp +++ b/pokemod/Tile.cpp @@ -22,6 +22,9 @@ #include "Tile.h" +const char* PokeGen::PokeMod::Tile::WaterStr[PokeGen::PokeMod::Tile::W_End] = {"None", "Normal", "Dive", "Waterfall", "Whirlpool"}; +const char* PokeGen::PokeMod::Tile::ForceStr[PokeGen::PokeMod::Tile::F_End] = {"None", "Slip", "Stop", "Force", "Push"}; + PokeGen::PokeMod::Tile::Tile(const Pokemod* par, const unsigned _id) : Object(_id, par), name(""), @@ -93,7 +96,7 @@ bool PokeGen::PokeMod::Tile::Validate() } if (forceType < F_End) { - if (((forceType == F_Slip) || (forceType == F_Force) || (forceType == F_Push)) && (DIR_End <= forceDirection)) + if (((forceType == F_Slip) || (forceType == F_Force) || (forceType == F_Push)) && (D_End <= forceDirection)) { pokemod->ValidationMsg("Invalid force direction"); isValid = false; @@ -267,7 +270,7 @@ bool PokeGen::PokeMod::Tile::SetForceType(const unsigned f) bool PokeGen::PokeMod::Tile::SetForceDirection(const unsigned f) { - if (f < DIR_End) + if (f < D_End) forceDirection = f; return (forceDirection == f); } @@ -307,7 +310,7 @@ bool PokeGen::PokeMod::Tile::GetIsWild() const return isWild; } -PokeGen::PokeMod::Frac PokeGen::PokeMod::Tile::GetWildChance() const +PokeGen::Frac PokeGen::PokeMod::Tile::GetWildChance() const { return wildChance; } |