diff options
| author | Ben Boeckel <MathStuf@gmail.com> | 2008-07-20 22:30:54 +0000 |
|---|---|---|
| committer | Ben Boeckel <MathStuf@gmail.com> | 2008-07-20 22:30:54 +0000 |
| commit | 96058e330b9a535ec3aecc40cfbd2fa74b791cd8 (patch) | |
| tree | 5afa3a01da6345b4f173e9578e0f7b0219cb9759 /pokebattle/Arena.cpp | |
| parent | a44d3c2ebd20e05c7c574cd3a13888fc471067b9 (diff) | |
| download | sigen-96058e330b9a535ec3aecc40cfbd2fa74b791cd8.tar.gz sigen-96058e330b9a535ec3aecc40cfbd2fa74b791cd8.tar.xz sigen-96058e330b9a535ec3aecc40cfbd2fa74b791cd8.zip | |
[FIX] Slimmed up main() for pokemodr
[FIX] Cleaned up initializing TeamMember
[FIX] Hat fixed up
[ADD] Added ActionQueue (thread-safe QQueue)
[FIX] Arena classes fleshed out a bit
[ADD] ATBTimer class added to mediate the ATB counters
git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@228 6ecfd1a5-f3ed-3746-8530-beee90d26b22
Diffstat (limited to 'pokebattle/Arena.cpp')
| -rw-r--r-- | pokebattle/Arena.cpp | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/pokebattle/Arena.cpp b/pokebattle/Arena.cpp index 4d5f3885..dbb2e857 100644 --- a/pokebattle/Arena.cpp +++ b/pokebattle/Arena.cpp @@ -29,12 +29,17 @@ #include <kross/core/actioncollection.h> #include <kross/core/manager.h> +Pokebattle::TeamMember::Action Pokebattle::requestDecision(const TeamMember*& teamMember) +{ + return teamMember->requestAction(); +} + QSet<int> Pokebattle::Arena::m_arenaIds; Pokebattle::Arena::Arena(QList<Player*> players) : - m_id(0), m_players(players), - m_actions(NULL) + m_actions(NULL), + m_id(0) { connect(this, SIGNAL(battleEnd()), SLOT(cleanUp())); connect(this, SIGNAL(battleEnd()), SLOT(unregisterAllScripts())); @@ -95,3 +100,8 @@ void Pokebattle::Arena::cleanUp() { // TODO: clean up everything } + +void Pokebattle::Arena::setupBattle() +{ + // TODO: setup all the battle stuff +} |