From ce38f43efebbedd97dfe5fb5de31e0b0f798d92d Mon Sep 17 00:00:00 2001
From: Ben Boeckel <MathStuf@gmail.com>
Date: Sun, 18 Jan 2009 19:04:35 -0500
Subject: Changed MapTrainer coordinate to position

---
 sigmod/MapTrainer.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'sigmod/MapTrainer.cpp')

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);
-- 
cgit