diff options
| author | Ben Boeckel <MathStuf@gmail.com> | 2009-02-12 00:43:35 -0500 |
|---|---|---|
| committer | Ben Boeckel <MathStuf@gmail.com> | 2009-02-12 00:43:35 -0500 |
| commit | ae8486fe31fa80762a24d5e6fda877aa7f803be2 (patch) | |
| tree | dc939f49851d1d779c33e83000f5b9080cda162f | |
| parent | d406c1be8a207cc64aa88c9b6326dd43ebfe4f04 (diff) | |
| download | sigen-ae8486fe31fa80762a24d5e6fda877aa7f803be2.tar.gz sigen-ae8486fe31fa80762a24d5e6fda877aa7f803be2.tar.xz sigen-ae8486fe31fa80762a24d5e6fda877aa7f803be2.zip | |
Fixed weather adding/removal in Arena
| -rw-r--r-- | sigencore/Arena.cpp | 4 | ||||
| -rw-r--r-- | sigencore/Arena.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/sigencore/Arena.cpp b/sigencore/Arena.cpp index c7de5f7c..be3e0ffe 100644 --- a/sigencore/Arena.cpp +++ b/sigencore/Arena.cpp @@ -177,7 +177,7 @@ QList<Sigscript::WeatherWrapper*> Sigencore::Arena::weathers() const return m_weathers.keys(); } -bool Sigencore::Arena::setWeather(TeamMember* teamMember, Sigscript::WeatherWrapper* weather) +void Sigencore::Arena::setWeather(TeamMember* teamMember, Sigscript::WeatherWrapper* weather) { ObjectMap objects; objects["arena"] = this; @@ -198,7 +198,9 @@ bool Sigencore::Arena::unsetWeather(Sigscript::WeatherWrapper* weather) delete m_weathers[weather]; m_weathers.remove(weather); emit(weatherEnded(weather)); + return true; } + return false; } Sigscript::SigmodWrapper* Sigencore::Arena::sigmod() const diff --git a/sigencore/Arena.h b/sigencore/Arena.h index 060c0d5d..c14b7893 100644 --- a/sigencore/Arena.h +++ b/sigencore/Arena.h @@ -85,7 +85,7 @@ class SIGENCORE_EXPORT Arena : public Sigscript::Config Q_SCRIPTABLE virtual TeamMember::Action requestAction(TeamMember* teamMember) const = 0; Q_SCRIPTABLE QList<Sigscript::WeatherWrapper*> weathers() const; - Q_SCRIPTABLE bool setWeather(TeamMember* teamMember, Sigscript::WeatherWrapper* weather); + Q_SCRIPTABLE void setWeather(TeamMember* teamMember, Sigscript::WeatherWrapper* weather); Q_SCRIPTABLE bool unsetWeather(Sigscript::WeatherWrapper* weather); Q_SCRIPTABLE Sigscript::SigmodWrapper* sigmod() const; |