summaryrefslogtreecommitdiffstats
path: root/sigencore/plugins/arenas/standard/TurnArena.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'sigencore/plugins/arenas/standard/TurnArena.cpp')
-rw-r--r--sigencore/plugins/arenas/standard/TurnArena.cpp12
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();
}