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/MapEffect.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/MapEffect.cpp')
| -rw-r--r-- | pokemod/MapEffect.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/pokemod/MapEffect.cpp b/pokemod/MapEffect.cpp index 14b50d8d..5d212f54 100644 --- a/pokemod/MapEffect.cpp +++ b/pokemod/MapEffect.cpp @@ -22,9 +22,6 @@ #include "MapEffect.h" -const char* PokeGen::PokeMod::MapEffect::MapEffectStr[PokeGen::PokeMod::MapEffect::E_End] = {"Item", "PC", "Strength Block", "Button", "Rock Smash", "Slot Machine", "Card Flip Game"}; -const char* PokeGen::PokeMod::MapEffect::PCTypeStr[PokeGen::PokeMod::MapEffect::PC_End] = {"Item", "Pokémon", "PokéDex", "Hall of Fame", "All"}; - PokeGen::PokeMod::MapEffect::MapEffect(const Pokemod* par, const unsigned _id) : Object(_id, par), name(""), @@ -94,7 +91,7 @@ bool PokeGen::PokeMod::MapEffect::Validate() pokemod->ValidationMsg("Invalid effect"); isValid = false; } - if (D_End_None <= direction) + if (DIR_End <= direction) { pokemod->ValidationMsg("Invalid driection"); isValid = false; @@ -251,7 +248,7 @@ bool PokeGen::PokeMod::MapEffect::SetVal2(const unsigned v2) bool PokeGen::PokeMod::MapEffect::SetDirection(const unsigned d) { - if (d < D_End_None) + if (d < DIR_End_None) direction = d; return (direction == d); } @@ -278,7 +275,7 @@ QString PokeGen::PokeMod::MapEffect::GetName() const return name; } -PokeGen::Point PokeGen::PokeMod::MapEffect::GetCoordinate() const +PokeGen::PokeMod::Point PokeGen::PokeMod::MapEffect::GetCoordinate() const { return coordinate; } @@ -293,7 +290,7 @@ unsigned PokeGen::PokeMod::MapEffect::GetCoordinateY() const return coordinate.GetY(); } -PokeGen::Flag PokeGen::PokeMod::MapEffect::GetExistFlag() const +PokeGen::PokeMod::Flag PokeGen::PokeMod::MapEffect::GetExistFlag() const { return existFlag; } |