[FIX] Slimmed up main() for pokemodr

[FIX] Cleaned up initializing TeamMember
[FIX] Hat fixed up
[ADD] Added ActionQueue (thread-safe QQueue)
[FIX] Arena classes fleshed out a bit
[ADD] ATBTimer class added to mediate the ATB counters

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

1 files changed, 23 insertions, 1 deletions

diff --git a/pokebattle/TurnArena.cpp b/pokebattle/TurnArena.cpp
index 2ec6eb55..a0ea2735 100644
--- a/pokebattle/TurnArena.cpp
+++ b/pokebattle/TurnArena.cpp
@@ -18,9 +18,31 @@
 // Header include
 #include "TurnArena.h"
 
+// Qt includes
+#include <QtCore/QtConcurrentMap>
+
 Pokebattle::TurnArena::TurnArena(QList<Player*> players) :
         Arena(players)
 {
-    emit(battleStart());
+    connect(this, SIGNAL(roundStart()), SLOT(processRound()));
+    setupBattle();
+}
+
+void Pokebattle::TurnArena::processRound()
+{
+//     QFuture<TeamMember::Action> actions = QtConcurrent::mapped(m_players, requestDecision);
+    // TODO: timeout here?
+    // TODO: determine the (preliminary) order of attacks
+    // TODO: wait for all actions (unless timeout)
+    // TODO: get order again
+    // TODO: act out actions (ignoring those that faint along the way)
+    emit(roundEnd());
+    // TODO: If only one player left, battle is over
+    // TODO: restart round again
 }
 
+void Pokebattle::TurnArena::setupBattle()
+{
+    // TODO: setup everything for the arena to do with the turns
+    Arena::setupBattle();
+}