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/Tile.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/Tile.cpp')
| -rw-r--r-- | pokemod/Tile.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/pokemod/Tile.cpp b/pokemod/Tile.cpp index 28b9ee84..6068f7d1 100644 --- a/pokemod/Tile.cpp +++ b/pokemod/Tile.cpp @@ -22,9 +22,6 @@ #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(""), @@ -96,7 +93,7 @@ bool PokeGen::PokeMod::Tile::Validate() } if (forceType < F_End) { - if (((forceType == F_Slip) || (forceType == F_Force) || (forceType == F_Push)) && (D_End <= forceDirection)) + if (((forceType == F_Slip) || (forceType == F_Force) || (forceType == F_Push)) && (DIR_End <= forceDirection)) { pokemod->ValidationMsg("Invalid force direction"); isValid = false; @@ -270,7 +267,7 @@ bool PokeGen::PokeMod::Tile::SetForceType(const unsigned f) bool PokeGen::PokeMod::Tile::SetForceDirection(const unsigned f) { - if (f < D_End) + if (f < DIR_End) forceDirection = f; return (forceDirection == f); } @@ -310,7 +307,7 @@ bool PokeGen::PokeMod::Tile::GetIsWild() const return isWild; } -PokeGen::Frac PokeGen::PokeMod::Tile::GetWildChance() const +PokeGen::PokeMod::Frac PokeGen::PokeMod::Tile::GetWildChance() const { return wildChance; } |