diff options
Diffstat (limited to 'sigbattle/ATBTimer.cpp')
| -rw-r--r-- | sigbattle/ATBTimer.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sigbattle/ATBTimer.cpp b/sigbattle/ATBTimer.cpp index d2f42ce2..874c6fb8 100644 --- a/sigbattle/ATBTimer.cpp +++ b/sigbattle/ATBTimer.cpp @@ -18,7 +18,7 @@ // Header include #include "ATBTimer.h" -// Pokebattle includes +// Sigbattle includes #include "ATBArena.h" // Qt includes @@ -31,7 +31,7 @@ // STL includes #include <functional> -Pokebattle::ATBTimer::ATBTimer(ATBArena* arena, ActionQueue& actions) : +Sigbattle::ATBTimer::ATBTimer(ATBArena* arena, ActionQueue& actions) : QThread(arena), m_arena(arena), m_actions(actions), @@ -40,12 +40,12 @@ Pokebattle::ATBTimer::ATBTimer(ATBArena* arena, ActionQueue& actions) : connect(m_timer, SIGNAL(timeout()), this, SLOT(update())); } -void Pokebattle::ATBTimer::update() +void Sigbattle::ATBTimer::update() { const QList<TeamMember*> active = m_timeStates.keys(); - QtConcurrent::blockingMap(active, std::bind1st(std::mem_fun(&Pokebattle::ATBTimer::increaseMeter), this)); + QtConcurrent::blockingMap(active, std::bind1st(std::mem_fun(&Sigbattle::ATBTimer::increaseMeter), this)); // TODO: adjust max time if needed - QList<TeamMember*> overflow = QtConcurrent::blockingFiltered(active, std::bind1st(std::mem_fun(&Pokebattle::ATBTimer::isOverflowed), this)); + QList<TeamMember*> overflow = QtConcurrent::blockingFiltered(active, std::bind1st(std::mem_fun(&Sigbattle::ATBTimer::isOverflowed), this)); QMultiMap<double, TeamMember*> sorter; foreach (TeamMember* teamMember, overflow) sorter.insert(m_timeStates[teamMember], teamMember); @@ -54,19 +54,19 @@ void Pokebattle::ATBTimer::update() m_actions.enqueue(requestDecision(teamMember)); } -void Pokebattle::ATBTimer::run() +void Sigbattle::ATBTimer::run() { m_timer->start(50); exec(); } -void Pokebattle::ATBTimer::increaseMeter(const TeamMember* teamMember) +void Sigbattle::ATBTimer::increaseMeter(const TeamMember* teamMember) { // TODO: tweak this(?) - m_timeStates[const_cast<TeamMember*>(teamMember)] += teamMember->statValue(Pokemod::ST_Speed) / 10; + m_timeStates[const_cast<TeamMember*>(teamMember)] += teamMember->statValue(Sigmod::ST_Speed) / 10; } -bool Pokebattle::ATBTimer::isOverflowed(const TeamMember* teamMember) const +bool Sigbattle::ATBTimer::isOverflowed(const TeamMember* teamMember) const { return m_threshold < m_timeStates[const_cast<TeamMember*>(teamMember)]; } |