diff options
author | Ben Boeckel <MathStuf@gmail.com> | 2009-03-28 16:40:41 -0400 |
---|---|---|
committer | Ben Boeckel <MathStuf@gmail.com> | 2009-03-28 16:40:41 -0400 |
commit | c1544eb9b062d8205d5d642dc331099270b21526 (patch) | |
tree | fb88cfca0520ea20aad2837ac381488cf8435089 /sigencore | |
parent | 342db2e06a68307c966f1e64a61118768ad41e98 (diff) | |
download | sigen-c1544eb9b062d8205d5d642dc331099270b21526.tar.gz sigen-c1544eb9b062d8205d5d642dc331099270b21526.tar.xz sigen-c1544eb9b062d8205d5d642dc331099270b21526.zip |
Remove the watcher and timer from the TurnArena, Player must time out and return Invalid
Diffstat (limited to 'sigencore')
-rw-r--r-- | sigencore/plugins/arenas/standard/TurnArena.cpp | 12 |
1 files changed, 0 insertions, 12 deletions
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(); } |