From 83f4b43f63960ba30e38cf5bb53cd98ae738ef74 Mon Sep 17 00:00:00 2001
From: Ben Boeckel <MathStuf@gmail.com>
Date: Fri, 26 Oct 2007 21:21:38 +0000
Subject: 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
---
 pokemod/MapWarp.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'pokemod/MapWarp.cpp')

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;
 }
-- 
cgit