From 927c42e73cce66acccc7056ea330a2362b455a00 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Sat, 11 Oct 2008 14:40:58 +0000 Subject: [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 --- sigbattle/ATBArena.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'sigbattle/ATBArena.h') 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 players, const bool isWild, QObject* parent); + ATBArena(Sigscript::SigmodWrapper* sigmod, QSet 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; -- cgit