From cd5c16bf69f96482a3d5af6581139d894563671e Mon Sep 17 00:00:00 2001
From: Treeki <treeki@gmail.com>
Date: Sun, 27 Jan 2013 21:41:56 +0100
Subject: fixed double deaths for sun and cloud

---
 src/mrsun.cpp        | 2 +-
 src/thundercloud.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

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;
-- 
cgit v1.2.3