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

(limited to 'pokemod/MapWarp.cpp')

diff --git a/pokemod/MapWarp.cpp b/pokemod/MapWarp.cpp
index 36252201..9864ea19 100644
--- a/pokemod/MapWarp.cpp
+++ b/pokemod/MapWarp.cpp
@@ -22,8 +22,6 @@
 
 #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(""),
@@ -63,7 +61,7 @@ bool PokeGen::PokeMod::MapWarp::Validate()
         pokemod->ValidationMsg("No access from any direction");
         isValid = false;
     }
-    if (D_End_None <= directionOut)
+    if (DIR_End_None <= directionOut)
     {
         pokemod->ValidationMsg("Invalid direction out");
         isValid = false;
@@ -188,7 +186,7 @@ void PokeGen::PokeMod::MapWarp::SetFromRight(const bool f)
 
 bool PokeGen::PokeMod::MapWarp::SetDirectionOut(const unsigned d)
 {
-    if (d < D_End)
+    if (d < DIR_End)
         directionOut = d;
     return (directionOut == d);
 }
@@ -267,7 +265,7 @@ QString PokeGen::PokeMod::MapWarp::GetName() const
     return name;
 }
 
-PokeGen::Point PokeGen::PokeMod::MapWarp::GetCoordinate() const
+PokeGen::PokeMod::Point PokeGen::PokeMod::MapWarp::GetCoordinate() const
 {
     return coordinate;
 }
@@ -337,7 +335,7 @@ unsigned PokeGen::PokeMod::MapWarp::GetToWarp() const
     return toWarp;
 }
 
-PokeGen::Flag PokeGen::PokeMod::MapWarp::GetWorkingFlag() const
+PokeGen::PokeMod::Flag PokeGen::PokeMod::MapWarp::GetWorkingFlag() const
 {
     return workingFlag;
 }
-- 
cgit