Changed MapTrainer coordinate to position

5 files changed, 27 insertions, 20 deletions

diff --git a/sigmod/MapTrainer.cpp b/sigmod/MapTrainer.cpp
index cbce8eb9..bb3530fb 100644
--- a/sigmod/MapTrainer.cpp
+++ b/sigmod/MapTrainer.cpp
@@ -38,7 +38,7 @@ Sigmod::MapTrainer::MapTrainer(const Map* parent, const int id) :
         Object(parent, id),
         m_name(""),
         m_trainerClass(INT_MAX),
-        m_coordinate(0, 0),
+        m_position(0, 0),
         m_numberFight(1),
         m_script("", ""),
         m_leadTeamMember(INT_MAX)
@@ -69,7 +69,7 @@ void Sigmod::MapTrainer::validate()
     if (m_name.isEmpty())
         emit(error("Name is empty"));
     TEST(trainerClass);
-    TEST(coordinate);
+    TEST(position);
     TEST(numberFight);
     if (teamMemberCount())
         TEST(leadTeamMember);
@@ -87,7 +87,7 @@ void Sigmod::MapTrainer::load(const QDomElement& xml)
     LOAD_BEGIN();
     LOAD(name);
     LOAD(trainerClass);
-    LOAD(coordinate);
+    LOAD(position);
     LOAD(numberFight);
     LOAD(script);
     LOAD(leadTeamMember);
@@ -100,7 +100,7 @@ QDomElement Sigmod::MapTrainer::save() const
     SAVE_CREATE();
     SAVE(name);
     SAVE(trainerClass);
-    SAVE(coordinate);
+    SAVE(position);
     SAVE(numberFight);
     SAVE(script);
     SAVE(leadTeamMember);
@@ -110,24 +110,24 @@ QDomElement Sigmod::MapTrainer::save() const
 
 SETTER(MapTrainer, QString&, Name, name)
 SETTER(MapTrainer, int, TrainerClass, trainerClass)
-SETTER(MapTrainer, QPoint&, Coordinate, coordinate)
+SETTER(MapTrainer, QPoint&, Position, position)
 SETTER(MapTrainer, int, NumberFight, numberFight)
 SETTER(MapTrainer, Sigcore::Script&, Script, script)
 SETTER(MapTrainer, int, LeadTeamMember, leadTeamMember)
 
 GETTER(MapTrainer, QString, name)
 GETTER(MapTrainer, int, trainerClass)
-GETTER(MapTrainer, QPoint, coordinate)
+GETTER(MapTrainer, QPoint, position)
 GETTER(MapTrainer, int, numberFight)
 GETTER(MapTrainer, Sigcore::Script, script)
 GETTER(MapTrainer, int, leadTeamMember)
 
 CHECK(MapTrainer, QString&, name)
 CHECK_INDEX(MapTrainer, int, trainerClass, sigmod(), trainer)
-CHECK_BEGIN(MapTrainer, QPoint&, coordinate)
+CHECK_BEGIN(MapTrainer, QPoint&, position)
     const Map* map = qobject_cast<const Map*>(parent());
-    TBOUNDS_MOD(coordinate_x, 0, map->width() - 1, coordinate.x())
-    TBOUNDS_MOD(coordinate_y, 0, map->height() - 1, coordinate.y())
+    TBOUNDS_MOD(position_x, 0, map->width() - 1, position.x())
+    TBOUNDS_MOD(position_y, 0, map->height() - 1, position.y())
 CHECK_END()
 CHECK_BOUNDS(MapTrainer, int, numberFight, 1, sigmod()->rules()->maxFight())
 CHECK(MapTrainer, Sigcore::Script&, script)
@@ -148,7 +148,7 @@ Sigmod::MapTrainer& Sigmod::MapTrainer::operator=(const MapTrainer& rhs)
     clear();
     COPY(name);
     COPY(trainerClass);
-    COPY(coordinate);
+    COPY(position);
     COPY(numberFight);
     COPY(script);
     COPY(leadTeamMember);
diff --git a/sigmod/MapTrainer.h b/sigmod/MapTrainer.h
index 27ba9c88..1327ec91 100644
--- a/sigmod/MapTrainer.h
+++ b/sigmod/MapTrainer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2008 Ben Boeckel <MathStuf@gmail.com>
+ * Copyright 2007-2009 Ben Boeckel <MathStuf@gmail.com>
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -52,21 +52,21 @@ class SIGMOD_EXPORT MapTrainer : public Object
         
         void setName(const QString& name);
         void setTrainerClass(const int trainerClass);
-        void setCoordinate(const QPoint& coordinate);
+        void setPosition(const QPoint& position);
         void setNumberFight(const int numberFight);
         void setScript(const Sigcore::Script& script);
         void setLeadTeamMember(const int leadTeamMember);
         
         QString name() const;
         int trainerClass() const;
-        QPoint coordinate() const;
+        QPoint position() const;
         int numberFight() const;
         Sigcore::Script script() const;
         int leadTeamMember() const;
         
         bool nameCheck(const QString& name) const;
         bool trainerClassCheck(const int trainerClass) const;
-        bool coordinateCheck(const QPoint& coordinate) const;
+        bool positionCheck(const QPoint& position) const;
         bool numberFightCheck(const int numberFight) const;
         bool scriptCheck(const Sigcore::Script& script) const;
         bool leadTeamMemberCheck(const int leadTeamMember) const;
@@ -92,7 +92,7 @@ class SIGMOD_EXPORT MapTrainer : public Object
         
         QString m_name;
         int m_trainerClass;
-        QPoint m_coordinate;
+        QPoint m_position;
         int m_numberFight;
         Sigcore::Script m_script;
         int m_leadTeamMember;
diff --git a/sigmodr/TrainerItem.cpp b/sigmodr/TrainerItem.cpp
index b23856be..55da4d10 100644
--- a/sigmodr/TrainerItem.cpp
+++ b/sigmodr/TrainerItem.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Ben Boeckel <MathStuf@gmail.com>
+ * Copyright 2008-2009 Ben Boeckel <MathStuf@gmail.com>
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -102,7 +102,7 @@ void Sigmodr::TrainerItem::mousePressEvent(QGraphicsSceneMouseEvent* event)
 void Sigmodr::TrainerItem::mouseMoveEvent(QGraphicsSceneMouseEvent* event)
 {
     QGraphicsItem::mouseMoveEvent(event);
-    m_trainer->setCoordinate(scenePos().toPoint());
+    m_trainer->setPosition(scenePos().toPoint());
 }
 
 void Sigmodr::TrainerItem::mouseReleaseEvent(QGraphicsSceneMouseEvent* event)
@@ -113,6 +113,6 @@ void Sigmodr::TrainerItem::mouseReleaseEvent(QGraphicsSceneMouseEvent* event)
 
 void Sigmodr::TrainerItem::trainerChanged()
 {
-    setPos(m_trainer->coordinate());
+    setPos(m_trainer->position());
     update();
 }
diff --git a/sigscript/MapTrainerWrapper.cpp b/sigscript/MapTrainerWrapper.cpp
index c8b6e2f4..6a630d3c 100644
--- a/sigscript/MapTrainerWrapper.cpp
+++ b/sigscript/MapTrainerWrapper.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Ben Boeckel <MathStuf@gmail.com>
+ * Copyright 2008-2009 Ben Boeckel <MathStuf@gmail.com>
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -47,6 +47,12 @@ Sigscript::TrainerWrapper* Sigscript::MapTrainerWrapper::trainerClass()
     return sigmod()->trainer(m_trainer->trainerClass());
 }
 
+QPoint Sigscript::MapTrainerWrapper::position() const
+{
+    ALLOW_OVERRIDE_SO(trainer, QPoint, position);
+    return m_trainer->position();
+}
+
 int Sigscript::MapTrainerWrapper::numberFight() const
 {
     return m_trainer->numberFight();
diff --git a/sigscript/MapTrainerWrapper.h b/sigscript/MapTrainerWrapper.h
index 2e91422e..0e87f2ee 100644
--- a/sigscript/MapTrainerWrapper.h
+++ b/sigscript/MapTrainerWrapper.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Ben Boeckel <MathStuf@gmail.com>
+ * Copyright 2008-2009 Ben Boeckel <MathStuf@gmail.com>
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -40,6 +40,7 @@ class SIGSCRIPT_EXPORT MapTrainerWrapper : public ObjectWrapper
         
         Q_SCRIPTABLE QString name() const;
         Q_SCRIPTABLE TrainerWrapper* trainerClass();
+        Q_SCRIPTABLE QPoint position() const;
         Q_SCRIPTABLE int numberFight() const;
         Q_SCRIPTABLE MapTrainerTeamMemberWrapper* leadTeamMember();
         Q_SCRIPTABLE Sigcore::Script script() const;