summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTreeki <treeki@gmail.com>2013-01-27 21:41:56 +0100
committerTreeki <treeki@gmail.com>2013-01-27 21:41:56 +0100
commitcd5c16bf69f96482a3d5af6581139d894563671e (patch)
treeeee357af237b224ef7f83efdd141f1433cf8dbbf /src
parent319f1ae65bafed165e2a9a3bb5a7433ba9b0b301 (diff)
downloadkamek-cd5c16bf69f96482a3d5af6581139d894563671e.tar.gz
kamek-cd5c16bf69f96482a3d5af6581139d894563671e.zip
fixed double deaths for sun and cloud
Diffstat (limited to 'src')
-rwxr-xr-xsrc/mrsun.cpp2
-rwxr-xr-xsrc/thundercloud.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/mrsun.cpp b/src/mrsun.cpp
index 1ccfdc9..267456a 100755
--- a/src/mrsun.cpp
+++ b/src/mrsun.cpp
@@ -253,7 +253,7 @@ int daMrSun_c::onExecute() {
updateModelMatrices();
if (dFlagMgr_c::instance->flags & this->eventFlag) {
- if (this->killFlag == 0) {
+ if (this->killFlag == 0 && acState.getCurrentState()->isNotEqual(&StateID_DieFall)) {
this->kill();
this->pos.y = this->pos.y + 800.0;
this->killFlag = 1;
diff --git a/src/thundercloud.cpp b/src/thundercloud.cpp
index ad01391..387b395 100755
--- a/src/thundercloud.cpp
+++ b/src/thundercloud.cpp
@@ -282,7 +282,7 @@ int dThunderCloud::onExecute() {
bodyModel._vf1C();
if ((dFlagMgr_c::instance->flags & this->eventFlag) && (!stationary)) {
- if (this->killFlag == 0) {
+ if (this->killFlag == 0 && acState.getCurrentState()->isNotEqual(&StateID_DieFall)) {
this->kill();
this->pos.y = this->pos.y + 800.0;
this->killFlag = 1;