summaryrefslogtreecommitdiffstats
path: root/sigbattle/ATBArena.h
diff options
context:
space:
mode:
authorBen Boeckel <MathStuf@gmail.com>2008-10-11 14:40:58 +0000
committerBen Boeckel <MathStuf@gmail.com>2008-10-11 14:40:58 +0000
commit927c42e73cce66acccc7056ea330a2362b455a00 (patch)
treefd37832bb336c19c2dc5d6776c36e6fff0b969d0 /sigbattle/ATBArena.h
parent3a096bed018254f9d662f9ae85792b8ae5df4837 (diff)
downloadsigen-927c42e73cce66acccc7056ea330a2362b455a00.tar.gz
sigen-927c42e73cce66acccc7056ea330a2362b455a00.tar.xz
sigen-927c42e73cce66acccc7056ea330a2362b455a00.zip
[FIX] Reordered sections in class declarations
[FIX] Using QSet rather than QList for players [ADD] Started signet library (compilation fails) git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@273 6ecfd1a5-f3ed-3746-8530-beee90d26b22
Diffstat (limited to 'sigbattle/ATBArena.h')
-rw-r--r--sigbattle/ATBArena.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/sigbattle/ATBArena.h b/sigbattle/ATBArena.h
index acdddaa1..b037f3a8 100644
--- a/sigbattle/ATBArena.h
+++ b/sigbattle/ATBArena.h
@@ -34,16 +34,16 @@ class SIGBATTLE_EXPORT ATBArena : public Arena
Q_OBJECT
public:
- ATBArena(Sigscript::SigmodWrapper* sigmod, QList<Player*> players, const bool isWild, QObject* parent);
+ ATBArena(Sigscript::SigmodWrapper* sigmod, QSet<Player*> players, const bool isWild, QObject* parent);
void handleAction(TeamMember* teamMember, TeamMember::Action action);
- signals:
public slots:
+ signals:
+ protected:
+ void setupBattle();
protected slots:
void processActions();
void cleanUp();
- protected:
- void setupBattle();
private:
ActionQueue m_decisions;
ATBTimer* m_atbTimer;