From 2b653821cc31f18adb5d50bb0bc19048939670dc Mon Sep 17 00:00:00 2001
From: Ben Boeckel <MathStuf@gmail.com>
Date: Mon, 21 Jan 2008 00:44:23 +0000
Subject: [ADD] More GUI classes (only MoveEffect left) [FIX] Polished up GUI
 classes [FIX] renamed methods get*ByID -> get*Index instead for more logical
 get*ByID [FIX] Renaming in pokemod to remove mention of Pokémon [FIX] minor
 .pro fixes (aesthetic mainly)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@35 6ecfd1a5-f3ed-3746-8530-beee90d26b22
---
 pokemod/MapEffect.cpp | 28 ++++------------------------
 1 file changed, 4 insertions(+), 24 deletions(-)

(limited to 'pokemod/MapEffect.cpp')

diff --git a/pokemod/MapEffect.cpp b/pokemod/MapEffect.cpp
index 252c456a..d6290436 100644
--- a/pokemod/MapEffect.cpp
+++ b/pokemod/MapEffect.cpp
@@ -78,7 +78,7 @@ bool PokeMod::MapEffect::validate() const
         switch (effect)
         {
             case E_Item:
-                if (pokemod.getItemByID(val2) == UINT_MAX)
+                if (pokemod.getItemIndex(val2) == UINT_MAX)
                     ok = false;
                 break;
             case E_PC:
@@ -107,7 +107,7 @@ bool PokeMod::MapEffect::validate() const
         pokemod.validationMsg("Invalid driection");
         valid = false;
     }
-    if (pokemod.getDialogByID(dialog) == UINT_MAX)
+    if (pokemod.getDialogIndex(dialog) == UINT_MAX)
     {
         pokemod.validationMsg("Invalid dialog");
         valid = false;
@@ -224,7 +224,7 @@ void PokeMod::MapEffect::setVal2(const unsigned v2) throw(Exception)
     switch (effect)
     {
         case E_Item:
-            if (pokemod.getItemByID(val2) == UINT_MAX)
+            if (pokemod.getItemIndex(val2) == UINT_MAX)
                 throw(BoundsException("MapEffect", "val2"));
             break;
         case E_PC:
@@ -262,7 +262,7 @@ void PokeMod::MapEffect::setCanMove(const bool c)
 
 void PokeMod::MapEffect::setDialog(const unsigned d) throw(BoundsException)
 {
-    if (pokemod.getDialogByID(d) == UINT_MAX)
+    if (pokemod.getDialogIndex(d) == UINT_MAX)
         throw(BoundsException("MapEffect", "dialog"));
     dialog = d;
 }
@@ -277,31 +277,11 @@ Point PokeMod::MapEffect::getCoordinate() const
     return coordinate;
 }
 
-unsigned PokeMod::MapEffect::getCoordinateX() const
-{
-    return coordinate.getX();
-}
-
-unsigned PokeMod::MapEffect::getCoordinateY() const
-{
-    return coordinate.getY();
-}
-
 Flag PokeMod::MapEffect::getExistFlag() const
 {
     return existFlag;
 }
 
-unsigned PokeMod::MapEffect::getExistFlagFlag() const
-{
-    return existFlag.getFlag();
-}
-
-unsigned PokeMod::MapEffect::getExistFlagStatus() const
-{
-    return existFlag.getStatus();
-}
-
 QString PokeMod::MapEffect::getSkin() const
 {
     return skin;
-- 
cgit