diff options
author | Ben Boeckel <MathStuf@gmail.com> | 2009-03-17 15:54:12 -0400 |
---|---|---|
committer | Ben Boeckel <MathStuf@gmail.com> | 2009-03-17 17:38:16 -0400 |
commit | d415d9136eaf7e9d68ccdde5a8a208b1a7eefea9 (patch) | |
tree | c4b01117c6be0b93656a3ffe6e63e4bc69ea46dc /sigencore | |
parent | eeb7188bcf741a8900fe993791642b1710984d40 (diff) | |
download | sigen-d415d9136eaf7e9d68ccdde5a8a208b1a7eefea9.tar.gz sigen-d415d9136eaf7e9d68ccdde5a8a208b1a7eefea9.tar.xz sigen-d415d9136eaf7e9d68ccdde5a8a208b1a7eefea9.zip |
Prepare ATB arena for rewrite
Diffstat (limited to 'sigencore')
-rw-r--r-- | sigencore/plugins/arenas/atb/ATBArena.cpp | 10 | ||||
-rw-r--r-- | sigencore/plugins/arenas/atb/ATBTimer.cpp | 17 | ||||
-rw-r--r-- | sigencore/plugins/arenas/atb/ATBTimer.h | 2 |
3 files changed, 15 insertions, 14 deletions
diff --git a/sigencore/plugins/arenas/atb/ATBArena.cpp b/sigencore/plugins/arenas/atb/ATBArena.cpp index 8e40c06d..654ddbfd 100644 --- a/sigencore/plugins/arenas/atb/ATBArena.cpp +++ b/sigencore/plugins/arenas/atb/ATBArena.cpp @@ -60,11 +60,11 @@ void ATBArena::processActions() { if (!m_decisions.isEmpty()) { - while (m_decisions.head().second.isFinished()) - { - TeamMember::RequestedAction action = m_decisions.dequeue(); - handleAction(action.first, action.second.result()); - } +// while (m_decisions.head().second.isFinished()) +// { +// TeamMember::RequestedAction action = m_decisions.dequeue(); +// handleAction(action.first, action.second.result()); +// } } } diff --git a/sigencore/plugins/arenas/atb/ATBTimer.cpp b/sigencore/plugins/arenas/atb/ATBTimer.cpp index b816b6d0..faf93786 100644 --- a/sigencore/plugins/arenas/atb/ATBTimer.cpp +++ b/sigencore/plugins/arenas/atb/ATBTimer.cpp @@ -28,6 +28,7 @@ // Qt includes #include <QtCore/QtAlgorithms> +#include <QtCore/QtConcurrentFilter> #include <QtCore/QtConcurrentMap> #include <QtCore/QFuture> #include <QtCore/QSignalMapper> @@ -58,16 +59,16 @@ void ATBTimer::timerEvent(QTimerEvent* event) Q_UNUSED(event) const QList<TeamMember*> active = m_arena->active(Arena::Fighters); QList<TeamMember::RequestedAction> actions; - QtConcurrent::blockingMap(active, increaseMeter); - QList<TeamMember*> overflow = QtConcurrent::blockingFiltered(active, isOverflowed); +// QtConcurrent::blockingMap(active, increaseMeter); +// QList<TeamMember*> overflow = QtConcurrent::blockingFiltered(active, isOverflowed); // qSort(overflow.begin(), overflow.end(), compareTimers); - foreach (TeamMember* teamMember, overflow) - { - TeamMember::RequestedAction action = requestDecision(teamMember); - m_actions.enqueue(action); +// foreach (TeamMember* teamMember, overflow) +// { +// TeamMember::RequestedAction action = requestDecision(teamMember); +// m_actions.enqueue(action); // if (m_arena->sigmod()->rules()->pausedATB()) // actions.append(action); - } +// } // if (m_arena->sigmod()->rules()->pausedATB()) // { // killTimer(event->timerId()); @@ -93,7 +94,7 @@ void ATBTimer::increaseMeter(TeamMember* teamMember) watcher->setFuture(action.second); connect(watcher, SIGNAL(finished()), m_signalMapper, SLOT(map())); m_signalMapper->setMapping(watcher, teamMember); - m_actions[teamMember] = action; + m_actions.set(teamMember, action); } } } diff --git a/sigencore/plugins/arenas/atb/ATBTimer.h b/sigencore/plugins/arenas/atb/ATBTimer.h index c6bc30b0..bad0b8f8 100644 --- a/sigencore/plugins/arenas/atb/ATBTimer.h +++ b/sigencore/plugins/arenas/atb/ATBTimer.h @@ -48,7 +48,7 @@ class ATBTimer : public QThread ATBArena* m_arena; QSignalMapper* m_signalMapper; QMap<Sigencore::TeamMember*, int> m_timers; - QList<QFutureWatcher<TeamMember::Action> > m_watchers; + QList<QFutureWatcher<Sigencore::TeamMember::Action> > m_watchers; ActionMap& m_actions; }; |