[FIX] Scrapped effects and such for scripts (going to use Kross) in pokemod

git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@166 6ecfd1a5-f3ed-3746-8530-beee90d26b22

1 files changed, 8 insertions, 63 deletions

diff --git a/pokemod/MapTrainer.cpp b/pokemod/MapTrainer.cpp
index 3bba2093..8b679960 100644
--- a/pokemod/MapTrainer.cpp
+++ b/pokemod/MapTrainer.cpp
@@ -19,7 +19,6 @@
 #include "MapTrainer.h"
 
 // Pokemod includes
-#include "Dialog.h"
 #include "Map.h"
 #include "MapTrainerTeamMember.h"
 #include "Pokemod.h"
@@ -39,11 +38,8 @@ MapTrainer::MapTrainer(const Map* parent, const int id) :
         m_name(""),
         m_trainerClass(INT_MAX),
         m_coordinate(0, 0),
-        m_sight(0),
-        m_direction(INT_MAX),
         m_numberFight(1),
-        m_appearFlag(0, 0),
-        m_dialog(INT_MAX),
+        m_script("", ""),
         m_leadTeamMember(INT_MAX)
 {
 }
@@ -71,9 +67,7 @@ void MapTrainer::validate()
         emit(error("Name is empty"));
     TEST(setTrainerClass, trainerClass);
     TEST(setCoordinate, coordinate);
-    TEST(setDirection, direction);
     TEST(setNumberFight, numberFight);
-    TEST(setDialog, dialog);
     TEST(setLeadTeamMember, leadTeamMember);
     if (!teamMemberCount())
         emit(error("There are no team members"));
@@ -93,11 +87,8 @@ void MapTrainer::load(const QDomElement& xml, int id)
     LOAD(QString, name);
     LOAD(int, trainerClass);
     LOAD(Point, coordinate);
-    LOAD(int, sight);
-    LOAD(int, direction);
     LOAD(int, numberFight);
-    LOAD(Flag, appearFlag);
-    LOAD(int, dialog);
+    LOAD(Script, script);
     LOAD_SUB(newTeamMember, MapTrainerTeamMember);
     LOAD(int, leadTeamMember);
 }
@@ -108,11 +99,8 @@ QDomElement MapTrainer::save() const
     SAVE(QString, name);
     SAVE(int, trainerClass);
     SAVE(Point, coordinate);
-    SAVE(int, sight);
-    SAVE(int, direction);
     SAVE(int, numberFight);
-    SAVE(Flag, appearFlag);
-    SAVE(int, dialog);
+    SAVE(Script, script);
     SAVE_SUB(MapTrainerTeamMember, teamMember);
     return xml;
 }
@@ -142,21 +130,6 @@ void MapTrainer::setCoordinate(const Point& coordinate)
     CHECK(coordinate);
 }
 
-void MapTrainer::setSight(const int sight)
-{
-    CHECK(sight);
-}
-
-void MapTrainer::setDirection(const int direction)
-{
-    if (Pokemod::D_End_None <= direction)
-    {
-        emit(error(bounds("direction")));
-        return;
-    }
-    CHECK(direction);
-}
-
 void MapTrainer::setNumberFight(const int numberFight)
 {
     if (!numberFight || (static_cast<const Pokemod*>(pokemod())->rules()->maxFight() < numberFight))
@@ -167,19 +140,9 @@ void MapTrainer::setNumberFight(const int numberFight)
     CHECK(numberFight);
 }
 
-void MapTrainer::setAppearFlag(const Flag& appearFlag)
-{
-    CHECK(appearFlag);
-}
-
-void MapTrainer::setDialog(const int dialog)
+void MapTrainer::setScript(const Script& script)
 {
-    if (static_cast<const Pokemod*>(pokemod())->dialogIndex(dialog) == INT_MAX)
-    {
-        emit(error(bounds("dialog")));
-        return;
-    }
-    CHECK(dialog);
+    CHECK(script);
 }
 
 void MapTrainer::setLeadTeamMember(const int leadTeamMember)
@@ -207,29 +170,14 @@ Point MapTrainer::coordinate() const
     return m_coordinate;
 }
 
-int MapTrainer::sight() const
-{
-    return m_sight;
-}
-
-int MapTrainer::direction() const
-{
-    return m_direction;
-}
-
 int MapTrainer::numberFight() const
 {
     return m_numberFight;
 }
 
-Flag MapTrainer::appearFlag() const
-{
-    return m_appearFlag;
-}
-
-int MapTrainer::dialog() const
+Script MapTrainer::script() const
 {
-    return m_dialog;
+    return m_script;
 }
 
 int MapTrainer::leadTeamMember() const
@@ -326,11 +274,8 @@ MapTrainer& MapTrainer::operator=(const MapTrainer& rhs)
     COPY(name);
     COPY(trainerClass);
     COPY(coordinate);
-    COPY(sight);
-    COPY(direction);
     COPY(numberFight);
-    COPY(appearFlag);
-    COPY(dialog);
+    COPY(script);
     COPY(leadTeamMember);
     COPY_SUB(MapTrainerTeamMember, teamMember);
     return *this;