Minor Fixes:

Better use of booleans for python
#include fixes for Windows
Python Doc fixes
Use the farthest vertex as the face position when z sorting faces. (Camera is on -z axis!)

3 files changed, 12 insertions, 37 deletions

diff --git a/source/gameengine/Ketsji/KX_Scene.h b/source/gameengine/Ketsji/KX_Scene.h
index c32cd4182aa..1df126ce1b0 100644
--- a/source/gameengine/Ketsji/KX_Scene.h
+++ b/source/gameengine/Ketsji/KX_Scene.h
@@ -57,38 +57,38 @@
 struct SM_MaterialProps;
 struct SM_ShapeProps;
 
+class GEN_HashedPtr;
 class CListValue;
-class RAS_BucketManager;
-class KX_Camera;
+class CValue;
 class SCA_LogicManager;
 class SCA_KeyboardManager;
 class SCA_TimeEventManager;
 class SCA_MouseManager;
-class KX_WorldInfo;
+class SCA_ISystem;
+class SCA_IInputDevice;
 class SND_Scene;
 class SND_IAudioDevice;
 class NG_NetworkDeviceInterface;
 class NG_NetworkScene;
+class SG_IObject;
 class SG_Node;
 class SG_Tree;
+class KX_WorldInfo;
 class KX_Camera;
-class GEN_HashedPtr;
 class KX_GameObject;
-class SCA_ISystem;
-class SCA_IInputDevice;
+class KX_LightObject;
+class RAS_BucketManager;
 class RAS_BucketManager;
 class RAS_MaterialBucket;
 class RAS_IPolyMaterial;
 class RAS_IRasterizer;
 class RAS_IRenderTools;
-class CValue;
-class SG_IObject;
 
 /**
  * The KX_Scene holds all data for an independent scene. It relates
  * KX_Objects to the specific objects in the modules.
  * */
-class KX_Scene : public SCA_IScene, public PyObjectPlus
+class KX_Scene : public PyObjectPlus, public SCA_IScene
 {
 	Py_Header;
 protected:
diff --git a/source/gameengine/Ketsji/KX_SceneActuator.cpp b/source/gameengine/Ketsji/KX_SceneActuator.cpp
index 996b671094a..721d01a3da3 100644
--- a/source/gameengine/Ketsji/KX_SceneActuator.cpp
+++ b/source/gameengine/Ketsji/KX_SceneActuator.cpp
@@ -247,18 +247,7 @@ PyObject* KX_SceneActuator::PySetUseRestart(PyObject* self,
 		return NULL;
 	}
 	
-	if (boolArg == KX_TRUE)
-	{
-		m_restart = true;
-	}
-	else if (boolArg == KX_FALSE)
-	{
-		m_restart = false;
-	}
-	else
-	{
-		; /* internal error */
-	}
+	m_restart = boolArg != 0;
 	
 	Py_Return;
 }
diff --git a/source/gameengine/Ketsji/KX_TouchSensor.cpp b/source/gameengine/Ketsji/KX_TouchSensor.cpp
index 9baa9377f02..9091a41d054 100644
--- a/source/gameengine/Ketsji/KX_TouchSensor.cpp
+++ b/source/gameengine/Ketsji/KX_TouchSensor.cpp
@@ -369,15 +369,7 @@ PyObject* KX_TouchSensor::PyGetTouchMaterial(PyObject* self,
 											 PyObject* args, 
 											 PyObject* kwds)
 {
-	int retval = 0;
-	
-	if (m_bFindMaterial) {
-		retval = KX_TRUE;
-	} else {
-		retval = KX_FALSE;
-	}
-
-	return PyInt_FromLong(retval);
+	return PyInt_FromLong(m_bFindMaterial);
 }
 
 /* 6. setTouchMaterial */
@@ -394,13 +386,7 @@ PyObject* KX_TouchSensor::PySetTouchMaterial(PyObject* self, PyObject* args, PyO
 		return NULL;
 	}
 	
-	if (pulseArg == KX_TRUE) {
-		m_bFindMaterial = true;
-	} else if (pulseArg == KX_FALSE){
-		m_bFindMaterial = false;
-	} else {
-		; /* internal error */
-	}
+	m_bFindMaterial = pulseArg != 0;
 
 	Py_Return;
 }