diff options
| author | Kester Maddock <Christopher.Maddock.1@uni.massey.ac.nz> | 2004-07-17 09:28:23 +0400 |
|---|---|---|
| committer | Kester Maddock <Christopher.Maddock.1@uni.massey.ac.nz> | 2004-07-17 09:28:23 +0400 |
| commit | baa2f99f079920d404af65798a8df3e82bcc6a48 (patch) | |
| tree | 2e8fb2bad0c3824e87e12cc0ebf3d4933eeb56f3 /source/gameengine/Ketsji/KX_NearSensor.cpp | |
| parent | 90fb63152628927d5d13b0101f4f2dcec025d2f7 (diff) | |
Port Python updates from Tuhopuu2:
getType/setType to action/sound actuator (sgefant)
Use a more generic python -> math conversion.
Diffstat (limited to 'source/gameengine/Ketsji/KX_NearSensor.cpp')
| -rw-r--r-- | source/gameengine/Ketsji/KX_NearSensor.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/gameengine/Ketsji/KX_NearSensor.cpp b/source/gameengine/Ketsji/KX_NearSensor.cpp index 3c6a5b9ba5e..3bb6bad5029 100644 --- a/source/gameengine/Ketsji/KX_NearSensor.cpp +++ b/source/gameengine/Ketsji/KX_NearSensor.cpp @@ -143,10 +143,12 @@ KX_NearSensor::~KX_NearSensor() { // for nearsensor, the sensor is the 'owner' of sumoobj // for touchsensor, it's the parent - static_cast<KX_TouchEventManager*>(m_eventmgr)->GetSumoScene()->remove(*m_sumoObj); - if (m_sumoObj) + { + static_cast<KX_TouchEventManager*>(m_eventmgr)->GetSumoScene()->remove(*m_sumoObj); delete m_sumoObj; + m_sumoObj = NULL; + } if (m_client_info) delete m_client_info; |