From c1544eb9b062d8205d5d642dc331099270b21526 Mon Sep 17 00:00:00 2001
From: Ben Boeckel <MathStuf@gmail.com>
Date: Sat, 28 Mar 2009 16:40:41 -0400
Subject: Remove the watcher and timer from the TurnArena, Player must time out
 and return Invalid

---
 sigencore/plugins/arenas/standard/TurnArena.cpp | 12 ------------
 1 file changed, 12 deletions(-)

(limited to 'sigencore')

diff --git a/sigencore/plugins/arenas/standard/TurnArena.cpp b/sigencore/plugins/arenas/standard/TurnArena.cpp
index cbf6f74b..233e512f 100644
--- a/sigencore/plugins/arenas/standard/TurnArena.cpp
+++ b/sigencore/plugins/arenas/standard/TurnArena.cpp
@@ -35,8 +35,6 @@
 #include <QtAlgorithms>
 #include <QtCore/QtConcurrentMap>
 #include <QtCore/QFuture>
-#include <QtCore/QFutureWatcher>
-#include <QtCore/QTimer>
 #include <QtGui/QIcon>
 
 using namespace Sigcore;
@@ -128,16 +126,8 @@ void TurnArena::processRound()
 {
     emit(roundAboutToStart());
     emit(roundStarted());
-    QFutureWatcher<TeamMember::RequestedAction>* watcher = new QFutureWatcher<TeamMember::RequestedAction>;
-    QTimer* timer = new QTimer;
-    int timeout = 120000;
-    valueOfType("round-timeout", &timeout);
-    connect(timer, SIGNAL(timeout()), watcher, SLOT(cancel()));
     QFuture<TeamMember::RequestedAction> reqActions = QtConcurrent::mapped(active(Fighters), &requestDecision);
-    watcher->setFuture(reqActions);
-    timer->start(timeout);
     reqActions.waitForFinished();
-    timer->stop();
     QList<TeamMember::RequestedAction> actions = reqActions.results();
     qStableSort(actions.begin(), actions.end(), sortActions);
     foreach (const TeamMember::RequestedAction& reqAction, actions)
@@ -165,8 +155,6 @@ void TurnArena::processRound()
     }
     emit(roundAboutToEnd());
     emit(roundEnded());
-    delete watcher;
-    delete timer;
     // TODO: Check if there is anyone left to fight
     processRound();
 }
-- 
cgit