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/MapWarp.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/MapWarp.cpp')
| -rw-r--r-- | pokemod/MapWarp.cpp | 34 |
1 files changed, 7 insertions, 27 deletions
diff --git a/pokemod/MapWarp.cpp b/pokemod/MapWarp.cpp index 33a85a2b..0a29d16f 100644 --- a/pokemod/MapWarp.cpp +++ b/pokemod/MapWarp.cpp @@ -78,20 +78,20 @@ bool PokeMod::MapWarp::validate() const pokemod.validationMsg("Invalid type"); valid = false; } - if (pokemod.getMapByID(toMap) == UINT_MAX) + if (pokemod.getMapIndex(toMap) == UINT_MAX) { pokemod.validationMsg("Invalid destination map"); valid = false; } else { - if (pokemod.getMap(pokemod.getMapByID(toMap)).getWarpByID(toWarp) == UINT_MAX) + if (pokemod.getMapByID(toMap).getWarpIndex(toWarp) == UINT_MAX) { pokemod.validationMsg("Invalid destnation warp"); valid = false; } } - if (pokemod.getDialogByID(dialog) == UINT_MAX) + if (pokemod.getDialogIndex(dialog) == UINT_MAX) { pokemod.validationMsg("Invalid dialog"); valid = false; @@ -210,7 +210,7 @@ void PokeMod::MapWarp::setIsFoggy(const bool i) void PokeMod::MapWarp::setToMap(const unsigned t) throw(BoundsException) { - if (pokemod.getMapByID(t) == UINT_MAX) + if (pokemod.getMapIndex(t) == UINT_MAX) throw(BoundsException("MapWarp", "toMap")); toMap = t; toWarp = UINT_MAX; @@ -218,9 +218,9 @@ void PokeMod::MapWarp::setToMap(const unsigned t) throw(BoundsException) void PokeMod::MapWarp::setToWarp(const unsigned t) throw(BoundsException) { - if (pokemod.getMapByID(toMap) == UINT_MAX) + if (pokemod.getMapIndex(toMap) == UINT_MAX) throw(BoundsException("MapWarp", "toMap")); - if (pokemod.getMap(pokemod.getMapByID(toMap)).getWarpByID(t) == UINT_MAX) + if (pokemod.getMapByID(toMap).getWarpIndex(t) == UINT_MAX) throw(BoundsException("MapWarp", "toWarp")); } @@ -241,7 +241,7 @@ void PokeMod::MapWarp::setWorkingFlagStatus(const unsigned s) void PokeMod::MapWarp::setDialog(const unsigned d) throw(BoundsException) { - if (pokemod.getDialogByID(d) == UINT_MAX) + if (pokemod.getDialogIndex(d) == UINT_MAX) throw(BoundsException("MapWarp", "dialog")); dialog = d; } @@ -256,16 +256,6 @@ Point PokeMod::MapWarp::getCoordinate() const return coordinate; } -unsigned PokeMod::MapWarp::getCoordinateX() const -{ - return coordinate.getX(); -} - -unsigned PokeMod::MapWarp::getCoordinateY() const -{ - return coordinate.getY(); -} - bool PokeMod::MapWarp::getFrom(const unsigned d) const throw(BoundsException) { if (D_End <= d) @@ -313,16 +303,6 @@ Flag PokeMod::MapWarp::getWorkingFlag() const return workingFlag; } -unsigned PokeMod::MapWarp::getWorkingFlagFlag() const -{ - return workingFlag.getFlag(); -} - -unsigned PokeMod::MapWarp::getWorkingFlagStatus() const -{ - return workingFlag.getStatus(); -} - unsigned PokeMod::MapWarp::getDialog() const { return dialog; |