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/Tile.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'pokemod/Tile.cpp')

diff --git a/pokemod/Tile.cpp b/pokemod/Tile.cpp
index 6068f7d1..28b9ee84 100644
--- a/pokemod/Tile.cpp
+++ b/pokemod/Tile.cpp
@@ -22,6 +22,9 @@
 
 #include "Tile.h"
 
+const char* PokeGen::PokeMod::Tile::WaterStr[PokeGen::PokeMod::Tile::W_End] = {"None", "Normal", "Dive", "Waterfall", "Whirlpool"};
+const char* PokeGen::PokeMod::Tile::ForceStr[PokeGen::PokeMod::Tile::F_End] = {"None", "Slip", "Stop", "Force", "Push"};
+
 PokeGen::PokeMod::Tile::Tile(const Pokemod* par, const unsigned _id) :
         Object(_id, par),
         name(""),
@@ -93,7 +96,7 @@ bool PokeGen::PokeMod::Tile::Validate()
     }
     if (forceType < F_End)
     {
-        if (((forceType == F_Slip) || (forceType == F_Force) || (forceType == F_Push)) && (DIR_End <= forceDirection))
+        if (((forceType == F_Slip) || (forceType == F_Force) || (forceType == F_Push)) && (D_End <= forceDirection))
         {
             pokemod->ValidationMsg("Invalid force direction");
             isValid = false;
@@ -267,7 +270,7 @@ bool PokeGen::PokeMod::Tile::SetForceType(const unsigned f)
 
 bool PokeGen::PokeMod::Tile::SetForceDirection(const unsigned f)
 {
-    if (f < DIR_End)
+    if (f < D_End)
         forceDirection = f;
     return (forceDirection == f);
 }
@@ -307,7 +310,7 @@ bool PokeGen::PokeMod::Tile::GetIsWild() const
     return isWild;
 }
 
-PokeGen::PokeMod::Frac PokeGen::PokeMod::Tile::GetWildChance() const
+PokeGen::Frac PokeGen::PokeMod::Tile::GetWildChance() const
 {
     return wildChance;
 }
-- 
cgit