diff options
author | Erwin Coumans <blender@erwincoumans.com> | 2007-01-07 07:35:33 +0300 |
---|---|---|
committer | Erwin Coumans <blender@erwincoumans.com> | 2007-01-07 07:35:33 +0300 |
commit | cf4d6278972046914764367f9b1b747dac012b00 (patch) | |
tree | 1a09a832e532781f409edec5f00caf8105a40252 /source/gameengine/Ketsji | |
parent | 275a5a94b9fd03cf5c7f11a84341a70c18bcfaac (diff) |
2 bugfixes by Malachy, related to message sensor / ipo actuator firing wrongly
Diffstat (limited to 'source/gameengine/Ketsji')
-rw-r--r-- | source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp | 4 | ||||
-rw-r--r-- | source/gameengine/Ketsji/KX_IpoActuator.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp b/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp index a01673f569f..86f114b2f51 100644 --- a/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp +++ b/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp @@ -90,7 +90,7 @@ bool KX_NetworkMessageSensor::Evaluate(CValue* event) bool result = false; bool WasUp = m_IsUp; -// m_IsUp = false; + m_IsUp = false; if (m_BodyList) { m_BodyList->Release(); @@ -153,7 +153,7 @@ bool KX_NetworkMessageSensor::IsPositiveTrigger() //attempt to fix [ #3809 ] IPO Actuator does not work with some Sensors //a better solution is to properly introduce separate Edge and Level triggering concept - return true;//m_IsUp; + return m_IsUp; } /* --------------------------------------------------------------------- */ diff --git a/source/gameengine/Ketsji/KX_IpoActuator.cpp b/source/gameengine/Ketsji/KX_IpoActuator.cpp index 1b6b92c790d..94468e13bd9 100644 --- a/source/gameengine/Ketsji/KX_IpoActuator.cpp +++ b/source/gameengine/Ketsji/KX_IpoActuator.cpp @@ -204,8 +204,8 @@ bool KX_IpoActuator::Update(double curtime, bool frame) for (vector<CValue*>::iterator i=m_events.end(); !(i==m_events.begin());) { --i; - if ((*i)->GetNumber() == 0.0f) - bNegativeEvent = true; +// if ((*i)->GetNumber() == 0.0f) +// bNegativeEvent = true; (*i)->Release(); } |