[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, 0 deletions

diff --git a/pokemod/Rules.cpp b/pokemod/Rules.cpp
index ded6a566..5e3a0b47 100644
--- a/pokemod/Rules.cpp
+++ b/pokemod/Rules.cpp
@@ -35,6 +35,7 @@ Pokemod::Rules::Rules(const Pokemod* parent) :
         m_genderAllowed(false),
         m_breedingAllowed(false),
         m_criticalDomains(false),
+        m_useTurns(true),
         m_numBoxes(0),
         m_boxSize(1),
         m_maxParty(1),
@@ -103,6 +104,7 @@ void Pokemod::Rules::load(const QDomElement& xml)
     LOAD(bool, genderAllowed);
     LOAD(bool, breedingAllowed);
     LOAD(bool, criticalDomains);
+    LOAD(bool, useTurns);
     LOAD(int, numBoxes);
     LOAD(int, boxSize);
     LOAD(int, maxParty);
@@ -135,6 +137,7 @@ QDomElement Pokemod::Rules::save() const
     SAVE(bool, genderAllowed);
     SAVE(bool, breedingAllowed);
     SAVE(bool, criticalDomains);
+    SAVE(bool, useTurns);
     SAVE(int, numBoxes);
     SAVE(int, boxSize);
     SAVE(int, maxParty);
@@ -182,6 +185,11 @@ void Pokemod::Rules::setCriticalDomains(const bool criticalDomains)
     CHECK(criticalDomains);
 }
 
+void Pokemod::Rules::setUseTurns(const bool useTurns)
+{
+    CHECK(useTurns);
+}
+
 void Pokemod::Rules::setNumBoxes(const int numBoxes)
 {
     CHECK(numBoxes);
@@ -367,6 +375,11 @@ bool Pokemod::Rules::criticalDomains() const
     return m_criticalDomains;
 }
 
+bool Pokemod::Rules::useTurns() const
+{
+    return m_useTurns;
+}
+
 int Pokemod::Rules::numBoxes() const
 {
     return m_numBoxes;
@@ -494,6 +507,7 @@ Pokemod::Rules& Pokemod::Rules::operator=(const Rules& rhs)
     COPY(genderAllowed);
     COPY(breedingAllowed);
     COPY(criticalDomains);
+    COPY(useTurns);
     COPY(numBoxes);
     COPY(boxSize);
     COPY(maxParty);