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/ItemEffect.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/ItemEffect.cpp')
| -rw-r--r-- | pokemod/ItemEffect.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/pokemod/ItemEffect.cpp b/pokemod/ItemEffect.cpp index 6a92a781..b3542460 100644 --- a/pokemod/ItemEffect.cpp +++ b/pokemod/ItemEffect.cpp @@ -185,7 +185,7 @@ bool PokeMod::ItemEffect::validate() const ok = false; break; case E_TypeBoost: - if (pokemod.getTypeByID(val2) == UINT_MAX) + if (pokemod.getTypeIndex(val2) == UINT_MAX) ok = false; break; case E_PPRestore: @@ -202,7 +202,7 @@ bool PokeMod::ItemEffect::validate() const break; case E_TM: case E_HM: - if (pokemod.getMoveByID(val2) == UINT_MAX) + if (pokemod.getMoveIndex(val2) == UINT_MAX) ok = false; break; case E_Ball: @@ -219,7 +219,7 @@ bool PokeMod::ItemEffect::validate() const ok = false; break; case E_Acorn: - if (pokemod.getItemByID(val2) == UINT_MAX) + if (pokemod.getItemIndex(val2) == UINT_MAX) ok = false; break; } @@ -251,7 +251,7 @@ bool PokeMod::ItemEffect::validate() const ok = false; break; case B_Time: - if (pokemod.getTimeByID(val3) == UINT_MAX) + if (pokemod.getTimeIndex(val3) == UINT_MAX) ok = false; break; case B_Stat: @@ -259,7 +259,7 @@ bool PokeMod::ItemEffect::validate() const ok = false; break; case B_Type: - if (pokemod.getTypeByID(val3) == UINT_MAX) + if (pokemod.getTypeIndex(val3) == UINT_MAX) ok = false; break; } @@ -517,7 +517,7 @@ void PokeMod::ItemEffect::setVal2(const unsigned v2) throw(Exception) throw(BoundsException("ItemEffect", "val2")); break; case E_TypeBoost: - if (pokemod.getTypeByID(val2) == UINT_MAX) + if (pokemod.getTypeIndex(val2) == UINT_MAX) throw(BoundsException("ItemEffect", "val2")); break; case E_PPRestore: @@ -534,7 +534,7 @@ void PokeMod::ItemEffect::setVal2(const unsigned v2) throw(Exception) break; case E_TM: case E_HM: - if (pokemod.getMoveByID(val2) == UINT_MAX) + if (pokemod.getMoveIndex(val2) == UINT_MAX) throw(BoundsException("ItemEffect", "val2")); break; case E_Ball: @@ -553,7 +553,7 @@ void PokeMod::ItemEffect::setVal2(const unsigned v2) throw(Exception) throw(BoundsException("ItemEffect", "val2")); break; case E_Acorn: - if (pokemod.getItemByID(val2) == UINT_MAX) + if (pokemod.getItemIndex(val2) == UINT_MAX) throw(BoundsException("ItemEffect", "val2")); break; default: @@ -583,7 +583,7 @@ void PokeMod::ItemEffect::setVal3(const unsigned v3) throw(Exception) throw(BoundsException("ItemEffect", "val3")); break; case B_Time: - if (pokemod.getTimeByID(val3) == UINT_MAX) + if (pokemod.getTimeIndex(val3) == UINT_MAX) throw(BoundsException("ItemEffect", "val3")); break; case B_Stat: @@ -591,7 +591,7 @@ void PokeMod::ItemEffect::setVal3(const unsigned v3) throw(Exception) throw(BoundsException("ItemEffect", "val3")); break; case B_Type: - if (pokemod.getTypeByID(val3) == UINT_MAX) + if (pokemod.getTypeIndex(val3) == UINT_MAX) throw(BoundsException("ItemEffect", "val3")); break; case B_Regular: |