[FIX] Replaced Point with QPoint (less duplicate code)

[FIX] Fraction and Point widgets are more compact
[FIX] Fleshed out more of the TeamMember
[FIX] Map tilemap editor now expands to fill all available area
[FIX] Added priority values to abilities and moves
[FIX] Added option for ATB-like battle rounds

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

1 files changed, 14 insertions, 1 deletions

diff --git a/pokemod/Move.cpp b/pokemod/Move.cpp
index 5393e427..1b0422d9 100644
--- a/pokemod/Move.cpp
+++ b/pokemod/Move.cpp
@@ -40,7 +40,7 @@ Pokemod::Move::Move(const Pokemod* parent, const int id) :
         m_special(false),
         m_overworld(false),
         m_powerPoints(0),
-        m_priority(1),
+        m_priority(0),
         m_description(""),
         m_script("", "")
 {
@@ -84,6 +84,7 @@ void Pokemod::Move::load(const QDomElement& xml)
     LOAD(bool, special);
     LOAD(bool, overworld);
     LOAD(int, powerPoints);
+    LOAD(int, priority);
     LOAD(QString, description);
     LOAD(Script, script);
 }
@@ -98,6 +99,7 @@ QDomElement Pokemod::Move::save() const
     SAVE(bool, special);
     SAVE(bool, overworld);
     SAVE(int, powerPoints);
+    SAVE(int, priority);
     SAVE(QString, description);
     SAVE(Script, script);
     return xml;
@@ -153,6 +155,11 @@ void Pokemod::Move::setPowerPoints(const int powerPoints)
     CHECK(powerPoints);
 }
 
+void Pokemod::Move::setPriority(const int priority)
+{
+    CHECK(priority);
+}
+
 void Pokemod::Move::setDescription(const QString& description)
 {
     CHECK(description);
@@ -198,6 +205,11 @@ int Pokemod::Move::powerPoints() const
     return m_powerPoints;
 }
 
+int Pokemod::Move::priority() const
+{
+    return m_priority;
+}
+
 QString Pokemod::Move::description() const
 {
     return m_description;
@@ -219,6 +231,7 @@ Pokemod::Move& Pokemod::Move::operator=(const Move& rhs)
     COPY(special);
     COPY(overworld);
     COPY(powerPoints);
+    COPY(priority);
     COPY(description);
     COPY(script);
     return *this;