diff options
| author | Ben Boeckel <MathStuf@gmail.com> | 2009-03-01 02:27:56 -0500 |
|---|---|---|
| committer | Ben Boeckel <MathStuf@gmail.com> | 2009-03-01 02:27:56 -0500 |
| commit | c33ab6cc802a867c53915c1bff5bd19493f26cf4 (patch) | |
| tree | 877168d08a4a6ed991d3c5dbc397eb793267bafe | |
| parent | af17a045c4cb54bc78621cb2563d5e95f555e181 (diff) | |
| download | sigen-c33ab6cc802a867c53915c1bff5bd19493f26cf4.tar.gz sigen-c33ab6cc802a867c53915c1bff5bd19493f26cf4.tar.xz sigen-c33ab6cc802a867c53915c1bff5bd19493f26cf4.zip | |
Removed isWild from Arena
| -rw-r--r-- | sigencore/Arena.cpp | 5 | ||||
| -rw-r--r-- | sigencore/Arena.h | 3 |
2 files changed, 2 insertions, 6 deletions
diff --git a/sigencore/Arena.cpp b/sigencore/Arena.cpp index b1941ddc..7d404311 100644 --- a/sigencore/Arena.cpp +++ b/sigencore/Arena.cpp @@ -63,10 +63,9 @@ TeamMember::Action Sigencore::decision(Player* player, TeamMember* teamMember) return player->requestAction(teamMember); } -Arena::Arena(GameWrapper* game, const bool isWild, Config* parent) : +Arena::Arena(GameWrapper* game, Config* parent) : Config(parent), m_game(game), - m_isWild(isWild), m_state(Setup), m_id(QUuid::createUuid()) { @@ -338,8 +337,6 @@ void Arena::handleAction(TeamMember* teamMember, TeamMember::Action action) } case TeamMember::Run: { - if (!m_isWild) - break; Player* self = player(teamMember); const int numFlee = self->active().size(); Fraction selfRunChance; diff --git a/sigencore/Arena.h b/sigencore/Arena.h index cda03016..2416e7e2 100644 --- a/sigencore/Arena.h +++ b/sigencore/Arena.h @@ -112,7 +112,7 @@ class SIGENCORE_EXPORT Arena : public Sigscript::Config void clientAdded(Client* client, const int team); void clientRemoved(Client* client, const int team); protected: - Arena(Sigscript::GameWrapper* game, const bool isWild, Sigscript::Config* parent); + Arena(Sigscript::GameWrapper* game, Sigscript::Config* parent); virtual ~Arena(); virtual void handleAction(TeamMember* teamMember, TeamMember::Action action); @@ -126,7 +126,6 @@ class SIGENCORE_EXPORT Arena : public Sigscript::Config Sigscript::GameWrapper* m_game; QGraphicsScene* m_scene; - const bool m_isWild; QMap<Client*, int> m_teams; Kross::ActionCollection* m_actions; QMap<Sigscript::WeatherWrapper*, Kross::Action*> m_weathers; |