BGE: renamed sensor type enum to avoid conflict with mingw (NEAR was causing the problem).

5 files changed, 9 insertions, 9 deletions

diff --git a/source/gameengine/GameLogic/SCA_ISensor.h b/source/gameengine/GameLogic/SCA_ISensor.h
index ad8865299d6..9bbd6ed41e4 100644
--- a/source/gameengine/GameLogic/SCA_ISensor.h
+++ b/source/gameengine/GameLogic/SCA_ISensor.h
@@ -93,10 +93,10 @@ protected:
 public:
 
 	enum sensortype {
-		NONE = 0,
-		TOUCH,
-		NEAR,
-		RADAR,
+		ST_NONE = 0,
+		ST_TOUCH,
+		ST_NEAR,
+		ST_RADAR,
 		// to be updated as needed
 	};
 
@@ -147,7 +147,7 @@ public:
 
 	virtual double GetNumber();
 
-	virtual sensortype GetSensorType() { return NONE; }
+	virtual sensortype GetSensorType() { return ST_NONE; }
 
 	/** Stop sensing for a while. */
 	void Suspend();
diff --git a/source/gameengine/Ketsji/KX_NearSensor.h b/source/gameengine/Ketsji/KX_NearSensor.h
index d98b464a443..63099e181a0 100644
--- a/source/gameengine/Ketsji/KX_NearSensor.h
+++ b/source/gameengine/Ketsji/KX_NearSensor.h
@@ -78,7 +78,7 @@ public:
 						 const PHY_CollData * coll_data); 
 	virtual bool	BroadPhaseFilterCollision(void*obj1,void*obj2);
 	virtual bool	BroadPhaseSensorFilterCollision(void*obj1,void*obj2) { return false; };
-	virtual sensortype GetSensorType() { return NEAR; }
+	virtual sensortype GetSensorType() { return ST_NEAR; }
 
 	/* --------------------------------------------------------------------- */
 	/* Python interface ---------------------------------------------------- */
diff --git a/source/gameengine/Ketsji/KX_RadarSensor.h b/source/gameengine/Ketsji/KX_RadarSensor.h
index 6779a9edffe..2e5a0e68bed 100644
--- a/source/gameengine/Ketsji/KX_RadarSensor.h
+++ b/source/gameengine/Ketsji/KX_RadarSensor.h
@@ -92,7 +92,7 @@ public:
 	virtual PyObject* py_getattro(PyObject *attr);
 	virtual PyObject* py_getattro_dict();
 	virtual int py_setattro(PyObject *attr, PyObject* value);
-	virtual sensortype GetSensorType() { return RADAR; }
+	virtual sensortype GetSensorType() { return ST_RADAR; }
 
 	//Deprecated ----->
 	KX_PYMETHOD_DOC_NOARGS(KX_RadarSensor,GetConeOrigin);
diff --git a/source/gameengine/Ketsji/KX_TouchEventManager.cpp b/source/gameengine/Ketsji/KX_TouchEventManager.cpp
index 46927541099..9603410c3ac 100644
--- a/source/gameengine/Ketsji/KX_TouchEventManager.cpp
+++ b/source/gameengine/Ketsji/KX_TouchEventManager.cpp
@@ -105,7 +105,7 @@ bool	 KX_TouchEventManager::newBroadphaseResponse(void *client_data,
 			it != info->m_sensors.end();
 			++it)
 		{
-			if ((*it)->GetSensorType() == SCA_ISensor::TOUCH) 
+			if ((*it)->GetSensorType() == SCA_ISensor::ST_TOUCH) 
 			{
 				KX_TouchSensor* touchsensor = static_cast<KX_TouchSensor*>(*it);
 				if (touchsensor->BroadPhaseSensorFilterCollision(object1, object2))
diff --git a/source/gameengine/Ketsji/KX_TouchSensor.h b/source/gameengine/Ketsji/KX_TouchSensor.h
index b62ec6eaf4d..476c63e89db 100644
--- a/source/gameengine/Ketsji/KX_TouchSensor.h
+++ b/source/gameengine/Ketsji/KX_TouchSensor.h
@@ -104,7 +104,7 @@ public:
 	// return value = true if collision should be checked on pair of object
 	virtual bool	BroadPhaseFilterCollision(void*obj1,void*obj2) { return true; }
 	virtual bool	BroadPhaseSensorFilterCollision(void*obj1,void*obj2);
-	virtual sensortype GetSensorType() { return TOUCH; }
+	virtual sensortype GetSensorType() { return ST_TOUCH; }
   
 
 	virtual bool IsPositiveTrigger() {