diff options
| author | Ben Boeckel <MathStuf@gmail.com> | 2009-03-17 23:18:01 -0400 |
|---|---|---|
| committer | Ben Boeckel <MathStuf@gmail.com> | 2009-03-17 23:18:01 -0400 |
| commit | 89291875d1a34fae8e33cbed06ede1d9a0d17cd7 (patch) | |
| tree | 8e51c76b7822fb1c5cd74d07633be84da58118c6 /sigencore | |
| parent | 690b0b0b9427acb266bc0cabfa88474c4f0a1c9c (diff) | |
| download | sigen-89291875d1a34fae8e33cbed06ede1d9a0d17cd7.tar.gz sigen-89291875d1a34fae8e33cbed06ede1d9a0d17cd7.tar.xz sigen-89291875d1a34fae8e33cbed06ede1d9a0d17cd7.zip | |
Move isTeamAllowed to be protected
Diffstat (limited to 'sigencore')
| -rw-r--r-- | sigencore/Arena.h | 4 | ||||
| -rw-r--r-- | sigencore/plugins/arenas/atb/ATBArena.h | 4 | ||||
| -rw-r--r-- | sigencore/plugins/arenas/standard/TurnArena.h | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/sigencore/Arena.h b/sigencore/Arena.h index e71a6458..f38efb2a 100644 --- a/sigencore/Arena.h +++ b/sigencore/Arena.h @@ -91,8 +91,6 @@ class SIGENCORE_EXPORT Arena : public Sigscript::Config Q_SCRIPTABLE QList<Sigscript::WeatherWrapper*> weathers() const; Q_SCRIPTABLE void setWeather(TeamMember* teamMember, Sigscript::WeatherWrapper* weather); Q_SCRIPTABLE bool unsetWeather(Sigscript::WeatherWrapper* weather); - - Q_SCRIPTABLE virtual bool isTeamAllowed(Team* team) = 0; public slots: bool addClient(Client* client, const int team); void removeClient(Client* client); @@ -117,6 +115,8 @@ class SIGENCORE_EXPORT Arena : public Sigscript::Config virtual void handleAction(TeamMember* teamMember, TeamMember::Action action); + virtual bool isTeamAllowed(Team* team) = 0; + virtual void setupBattle(); virtual void distributeWinnings(); diff --git a/sigencore/plugins/arenas/atb/ATBArena.h b/sigencore/plugins/arenas/atb/ATBArena.h index 6d796886..1b3ec9af 100644 --- a/sigencore/plugins/arenas/atb/ATBArena.h +++ b/sigencore/plugins/arenas/atb/ATBArena.h @@ -39,11 +39,11 @@ class ATBArena : public Sigencore::Arena static QString name(); static QString description(); static QIcon icon(); - - Q_SCRIPTABLE virtual bool isTeamAllowed(Sigencore::Team* team); protected: virtual void handleAction(Sigencore::TeamMember* teamMember, Sigencore::TeamMember::Action action); + virtual bool isTeamAllowed(Sigencore::Team* team); + virtual void setupBattle(); virtual void distributeWinnings(); diff --git a/sigencore/plugins/arenas/standard/TurnArena.h b/sigencore/plugins/arenas/standard/TurnArena.h index 15fd7318..9dce6ea3 100644 --- a/sigencore/plugins/arenas/standard/TurnArena.h +++ b/sigencore/plugins/arenas/standard/TurnArena.h @@ -31,8 +31,6 @@ class TurnArena : public Sigencore::Arena static QString name(); static QString description(); static QIcon icon(); - - Q_SCRIPTABLE virtual bool isTeamAllowed(Sigencore::Team* team); signals: void roundAboutToStart(); void roundStarted(); @@ -41,6 +39,8 @@ class TurnArena : public Sigencore::Arena protected: virtual void handleAction(Sigencore::TeamMember* teamMember, Sigencore::TeamMember::Action action); + virtual bool isTeamAllowed(Sigencore::Team* team); + virtual void setupBattle(); virtual void distributeWinnings(); |