diff options
Diffstat (limited to 'source/gameengine/GameLogic/SCA_PropertySensor.cpp')
| -rw-r--r-- | source/gameengine/GameLogic/SCA_PropertySensor.cpp | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/source/gameengine/GameLogic/SCA_PropertySensor.cpp b/source/gameengine/GameLogic/SCA_PropertySensor.cpp index 6f34f8710c1..82f3bee86b2 100644 --- a/source/gameengine/GameLogic/SCA_PropertySensor.cpp +++ b/source/gameengine/GameLogic/SCA_PropertySensor.cpp @@ -37,14 +37,14 @@ #include <iostream> #include "SCA_PropertySensor.h" -#include "Operator2Expr.h" -#include "ConstExpr.h" -#include "InputParser.h" -#include "StringValue.h" +#include "EXP_Operator2Expr.h" +#include "EXP_ConstExpr.h" +#include "EXP_InputParser.h" +#include "EXP_StringValue.h" #include "SCA_EventManager.h" #include "SCA_LogicManager.h" -#include "BoolValue.h" -#include "FloatValue.h" +#include "EXP_BoolValue.h" +#include "EXP_FloatValue.h" #include <stdio.h> SCA_PropertySensor::SCA_PropertySensor(SCA_EventManager* eventmgr, @@ -265,13 +265,8 @@ bool SCA_PropertySensor::CheckPropertyCondition() //the concept of Edge and Level triggering has unwanted effect for KX_PROPSENSOR_CHANGED //see Game Engine bugtracker [ #3809 ] - if (m_checktype != KX_PROPSENSOR_CHANGED) - { - m_recentresult=result; - } else - { - m_recentresult=result;//true; - } + m_recentresult = result; + return result; } |