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/MapEffect.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/MapEffect.cpp')
| -rw-r--r-- | pokemod/MapEffect.cpp | 28 |
1 files changed, 4 insertions, 24 deletions
diff --git a/pokemod/MapEffect.cpp b/pokemod/MapEffect.cpp index 252c456a..d6290436 100644 --- a/pokemod/MapEffect.cpp +++ b/pokemod/MapEffect.cpp @@ -78,7 +78,7 @@ bool PokeMod::MapEffect::validate() const switch (effect) { case E_Item: - if (pokemod.getItemByID(val2) == UINT_MAX) + if (pokemod.getItemIndex(val2) == UINT_MAX) ok = false; break; case E_PC: @@ -107,7 +107,7 @@ bool PokeMod::MapEffect::validate() const pokemod.validationMsg("Invalid driection"); valid = false; } - if (pokemod.getDialogByID(dialog) == UINT_MAX) + if (pokemod.getDialogIndex(dialog) == UINT_MAX) { pokemod.validationMsg("Invalid dialog"); valid = false; @@ -224,7 +224,7 @@ void PokeMod::MapEffect::setVal2(const unsigned v2) throw(Exception) switch (effect) { case E_Item: - if (pokemod.getItemByID(val2) == UINT_MAX) + if (pokemod.getItemIndex(val2) == UINT_MAX) throw(BoundsException("MapEffect", "val2")); break; case E_PC: @@ -262,7 +262,7 @@ void PokeMod::MapEffect::setCanMove(const bool c) void PokeMod::MapEffect::setDialog(const unsigned d) throw(BoundsException) { - if (pokemod.getDialogByID(d) == UINT_MAX) + if (pokemod.getDialogIndex(d) == UINT_MAX) throw(BoundsException("MapEffect", "dialog")); dialog = d; } @@ -277,31 +277,11 @@ Point PokeMod::MapEffect::getCoordinate() const return coordinate; } -unsigned PokeMod::MapEffect::getCoordinateX() const -{ - return coordinate.getX(); -} - -unsigned PokeMod::MapEffect::getCoordinateY() const -{ - return coordinate.getY(); -} - Flag PokeMod::MapEffect::getExistFlag() const { return existFlag; } -unsigned PokeMod::MapEffect::getExistFlagFlag() const -{ - return existFlag.getFlag(); -} - -unsigned PokeMod::MapEffect::getExistFlagStatus() const -{ - return existFlag.getStatus(); -} - QString PokeMod::MapEffect::getSkin() const { return skin; |