diff options
| author | Ben Boeckel <MathStuf@gmail.com> | 2009-01-21 02:00:23 -0500 |
|---|---|---|
| committer | Ben Boeckel <MathStuf@gmail.com> | 2009-01-21 02:00:30 -0500 |
| commit | 6e49e0f0b060758216e62aa16841e310ae4311de (patch) | |
| tree | db081a3e065f97a06ed3f2ff35a9c94667bf4439 /sigbattle | |
| parent | b804a83e0cef19e9e0c95cfdecadf313a96146ad (diff) | |
| download | sigen-6e49e0f0b060758216e62aa16841e310ae4311de.tar.gz sigen-6e49e0f0b060758216e62aa16841e310ae4311de.tar.xz sigen-6e49e0f0b060758216e62aa16841e310ae4311de.zip | |
Fixing up Rules widget and reworked ATB in rules
Diffstat (limited to 'sigbattle')
| -rw-r--r-- | sigbattle/ATBTimer.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sigbattle/ATBTimer.cpp b/sigbattle/ATBTimer.cpp index d6ae6106..06abc827 100644 --- a/sigbattle/ATBTimer.cpp +++ b/sigbattle/ATBTimer.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2008 Ben Boeckel <MathStuf@gmail.com> + * Copyright 2008-2009 Ben Boeckel <MathStuf@gmail.com> * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -79,14 +79,14 @@ void Sigbattle::ATBTimer::timerEvent(QTimerEvent* event) { 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()); - for (QMutableListIterator<TeamMember::RequestedAction> i(actions); i.hasNext(); i.next()) - i.value().second.waitForFinished(); - startTimer(50); +// if (m_arena->sigmod()->rules()->pausedATB()) +// actions.append(action); } +// if (m_arena->sigmod()->rules()->pausedATB()) +// { +// killTimer(event->timerId()); +// for (QMutableListIterator<TeamMember::RequestedAction> i(actions); i.hasNext(); i.next()) +// i.value().second.waitForFinished(); +// startTimer(50); +// } } |
