diff options
| author | Ben Boeckel <MathStuf@gmail.com> | 2007-10-26 21:21:38 +0000 |
|---|---|---|
| committer | Ben Boeckel <MathStuf@gmail.com> | 2007-10-26 21:21:38 +0000 |
| commit | 83f4b43f63960ba30e38cf5bb53cd98ae738ef74 (patch) | |
| tree | 80f37f9e4a35ea11b8b1f0369f90208f393df83f /pokemod/MapEffect.cpp | |
| parent | 4385af885daf460a18e236f08509358f764b2c8c (diff) | |
Redoing rev25
[ADD] DISCLAIMER
[FIX] PokemonEvolution styles
[ADD] Relative enumeration
[DEL] pokemod/Status.{h, cpp}
[DEL] pokemod/StatusEffect.{h, cpp}
[FIX] Status effects will be added as needed instead of customized
[FIX] Completed ItemEffects
[FIX] Factored out Natures to be global
[DEL] pokemod/PokemonNature.{h, cpp}
[DEL] ai/Net.{h, cpp}
[DEL] ai/Layer/{h, cpp}
[ADD] battle/Arena.{h, cpp}
[ADD] battle/Team.{h, cpp}
[ADD] battle/Human.{h, cpp}
[ADD] battle/Bot.{h, cpp}
[ADD] battle/GhostBot.{h, cpp}
[ADD] battle/Pokemon.{h, cpp}
[ADD] battle/Ghost.{h, cpp}
[FIX] Fixed some scope errors in pokemod
[ADD] audio/audio.pro
[ADD] audio/Audio.{h, cpp}
[ADD] audio/AudioLibrary.{h, cpp}
[ADD] audio/AudioSystem.{h, cpp}
[ADD] audio/Music.{h, cpp}
[ADD] audio/SoundEffect.{h, cpp}
[DEL] old audio system (was in C)
[FIX] Optimized some routines in pokemod
[FIX] Moved global classes (Ini, Frac, Matrix, FracMatrix, Point, Flag) to general
git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@27 6ecfd1a5-f3ed-3746-8530-beee90d26b22
Diffstat (limited to 'pokemod/MapEffect.cpp')
| -rw-r--r-- | pokemod/MapEffect.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/pokemod/MapEffect.cpp b/pokemod/MapEffect.cpp index 5d212f54..14b50d8d 100644 --- a/pokemod/MapEffect.cpp +++ b/pokemod/MapEffect.cpp @@ -22,6 +22,9 @@ #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(""), @@ -91,7 +94,7 @@ bool PokeGen::PokeMod::MapEffect::Validate() pokemod->ValidationMsg("Invalid effect"); isValid = false; } - if (DIR_End <= direction) + if (D_End_None <= direction) { pokemod->ValidationMsg("Invalid driection"); isValid = false; @@ -248,7 +251,7 @@ bool PokeGen::PokeMod::MapEffect::SetVal2(const unsigned v2) bool PokeGen::PokeMod::MapEffect::SetDirection(const unsigned d) { - if (d < DIR_End_None) + if (d < D_End_None) direction = d; return (direction == d); } @@ -275,7 +278,7 @@ QString PokeGen::PokeMod::MapEffect::GetName() const return name; } -PokeGen::PokeMod::Point PokeGen::PokeMod::MapEffect::GetCoordinate() const +PokeGen::Point PokeGen::PokeMod::MapEffect::GetCoordinate() const { return coordinate; } @@ -290,7 +293,7 @@ unsigned PokeGen::PokeMod::MapEffect::GetCoordinateY() const return coordinate.GetY(); } -PokeGen::PokeMod::Flag PokeGen::PokeMod::MapEffect::GetExistFlag() const +PokeGen::Flag PokeGen::PokeMod::MapEffect::GetExistFlag() const { return existFlag; } |