diff options
| author | Ben Boeckel <MathStuf@gmail.com> | 2007-10-26 20:01:48 +0000 |
|---|---|---|
| committer | Ben Boeckel <MathStuf@gmail.com> | 2007-10-26 20:01:48 +0000 |
| commit | 1f08afc80c73087bf9bde639754670548b89fc9f (patch) | |
| tree | 70a80d7998d9279a75509fed14238b3ba493e9eb /pokemod/MapWarp.cpp | |
| parent | 5b55d13ead7e352ee1feaae72009e8abf5bd071a (diff) | |
[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@25 6ecfd1a5-f3ed-3746-8530-beee90d26b22
Diffstat (limited to 'pokemod/MapWarp.cpp')
| -rw-r--r-- | pokemod/MapWarp.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/pokemod/MapWarp.cpp b/pokemod/MapWarp.cpp index 9864ea19..36252201 100644 --- a/pokemod/MapWarp.cpp +++ b/pokemod/MapWarp.cpp @@ -22,6 +22,8 @@ #include "MapWarp.h" +const char* PokeGen::PokeMod::MapWarp::TypeStr[PokeGen::PokeMod::MapWarp::End] = {"Door/Stair", "Warp Pad", "Hole", "Boundary"}; + PokeGen::PokeMod::MapWarp::MapWarp(const Pokemod* par, const unsigned _id) : Object(_id, par), name(""), @@ -61,7 +63,7 @@ bool PokeGen::PokeMod::MapWarp::Validate() pokemod->ValidationMsg("No access from any direction"); isValid = false; } - if (DIR_End_None <= directionOut) + if (D_End_None <= directionOut) { pokemod->ValidationMsg("Invalid direction out"); isValid = false; @@ -186,7 +188,7 @@ void PokeGen::PokeMod::MapWarp::SetFromRight(const bool f) bool PokeGen::PokeMod::MapWarp::SetDirectionOut(const unsigned d) { - if (d < DIR_End) + if (d < D_End) directionOut = d; return (directionOut == d); } @@ -265,7 +267,7 @@ QString PokeGen::PokeMod::MapWarp::GetName() const return name; } -PokeGen::PokeMod::Point PokeGen::PokeMod::MapWarp::GetCoordinate() const +PokeGen::Point PokeGen::PokeMod::MapWarp::GetCoordinate() const { return coordinate; } @@ -335,7 +337,7 @@ unsigned PokeGen::PokeMod::MapWarp::GetToWarp() const return toWarp; } -PokeGen::PokeMod::Flag PokeGen::PokeMod::MapWarp::GetWorkingFlag() const +PokeGen::Flag PokeGen::PokeMod::MapWarp::GetWorkingFlag() const { return workingFlag; } |