diff options
| author | Ben Boeckel <MathStuf@gmail.com> | 2008-01-21 00:44:23 +0000 |
|---|---|---|
| committer | Ben Boeckel <MathStuf@gmail.com> | 2008-01-21 00:44:23 +0000 |
| commit | 2b653821cc31f18adb5d50bb0bc19048939670dc (patch) | |
| tree | d333bbf0d1dde8fe0c1633bea60785b20ac07841 /pokemod/Tile.cpp | |
| parent | e27ba66952a1e851bb417611e0ed7df1fbf5f945 (diff) | |
| download | sigen-2b653821cc31f18adb5d50bb0bc19048939670dc.tar.gz sigen-2b653821cc31f18adb5d50bb0bc19048939670dc.tar.xz sigen-2b653821cc31f18adb5d50bb0bc19048939670dc.zip | |
[ADD] More GUI classes (only MoveEffect left)
[FIX] Polished up GUI classes
[FIX] renamed methods get*ByID -> get*Index instead for more logical get*ByID
[FIX] Renaming in pokemod to remove mention of Pokémon
[FIX] minor .pro fixes (aesthetic mainly)
git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@35 6ecfd1a5-f3ed-3746-8530-beee90d26b22
Diffstat (limited to 'pokemod/Tile.cpp')
| -rw-r--r-- | pokemod/Tile.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pokemod/Tile.cpp b/pokemod/Tile.cpp index 60486b9f..7d941bf6 100644 --- a/pokemod/Tile.cpp +++ b/pokemod/Tile.cpp @@ -72,12 +72,12 @@ bool PokeMod::Tile::validate() const pokemod.validationMsg("A waterfall tile must be accessible from above and below"); valid = false; } - else if ((hmType == H_Whirlpool) && ((under == id) || (pokemod.getTileByID(under) == UINT_MAX) || (pokemod.getTile(pokemod.getTileByID(under)).getHMType() != H_Surf) || (pokemod.getTile(pokemod.getTileByID(under)).getHMType() != H_Dive))) + else if ((hmType == H_Whirlpool) && ((under == id) || (pokemod.getTileIndex(under) == UINT_MAX) || (pokemod.getTile(pokemod.getTileIndex(under)).getHMType() != H_Surf) || (pokemod.getTile(pokemod.getTileIndex(under)).getHMType() != H_Dive))) { pokemod.validationMsg("Invalid under tile"); valid = false; } - else if ((hmType == H_Whirlpool) && ((under == id) || (pokemod.getTileByID(under) == UINT_MAX) || (pokemod.getTile(pokemod.getTileByID(under)).getHMType() != H_None))) + else if ((hmType == H_Whirlpool) && ((under == id) || (pokemod.getTileIndex(under) == UINT_MAX) || (pokemod.getTile(pokemod.getTileIndex(under)).getHMType() != H_None))) { pokemod.validationMsg("Invalid under tile"); valid = false; @@ -192,7 +192,7 @@ void PokeMod::Tile::setUnder(const unsigned u) throw(Exception) { if ((hmType != H_Whirlpool) || (hmType != H_Cut) || (hmType != H_RockSmash)) throw(UnusedException("Tile", "under")); - if ((u == id) || (pokemod.getTileByID(u) == UINT_MAX)) + if ((u == id) || (pokemod.getTileIndex(u) == UINT_MAX)) throw(BoundsException("Tile", "under")); under = u; } |