Synchronise game engine with Tuhopuu2 tree.

4 files changed, 20 insertions, 13 deletions

diff --git a/source/gameengine/Ketsji/KX_Camera.cpp b/source/gameengine/Ketsji/KX_Camera.cpp
index 69bf4dd69ce..c99e4824851 100644
--- a/source/gameengine/Ketsji/KX_Camera.cpp
+++ b/source/gameengine/Ketsji/KX_Camera.cpp
@@ -41,11 +41,11 @@ KX_Camera::KX_Camera(void* sgReplicationInfo,
 					 SG_Callbacks callbacks,
 					 const RAS_CameraData& camdata)
 					:
-					KX_GameObject(sgReplicationInfo,callbacks)
+					KX_GameObject(sgReplicationInfo,callbacks),
+					m_camdata(camdata)
 {
 	// setting a name would be nice...
 	m_name = "cam";
-	m_camdata = camdata;
 	SetProperty("camera",new CIntValue(1));
 }
 
diff --git a/source/gameengine/Ketsji/KX_GameObject.h b/source/gameengine/Ketsji/KX_GameObject.h
index 84ce0778fbb..e503f57ae9f 100644
--- a/source/gameengine/Ketsji/KX_GameObject.h
+++ b/source/gameengine/Ketsji/KX_GameObject.h
@@ -59,29 +59,32 @@ class RAS_MeshObject;
 class KX_IPhysicsController;
 class SM_Object;
 
+/**
+ * KX_GameObject is the main class for dynamic objects.
+ */
 class KX_GameObject : public SCA_IObject
 {
 	Py_Header;
 
-	bool					m_bDyna;
-	KX_ClientObjectInfo*			m_pClient_info;
-	STR_String				m_name;
-	STR_String				m_text;
+	bool								m_bDyna;
+	KX_ClientObjectInfo*				m_pClient_info;
+	STR_String							m_name;
+	STR_String							m_text;
 	std::vector<RAS_MeshObject*>		m_meshes;
 	
-	bool					m_bSuspendDynamics;
-	bool					m_bUseObjectColor;
-	MT_Vector4				m_objectColor;
+	bool								m_bSuspendDynamics;
+	bool								m_bUseObjectColor;
+	MT_Vector4							m_objectColor;
 
 	// Is this object set to be visible? Only useful for the
 	// visibility subsystem right now.
-	bool					m_bVisible; 
+	bool       m_bVisible; 
 
-	KX_IPhysicsController*			m_pPhysicsController1;
-	SG_Node*				m_pSGNode;
+	KX_IPhysicsController*				m_pPhysicsController1;
+	SG_Node*							m_pSGNode;
 
 protected:
-	MT_CmMatrix4x4				m_OpenGL_4x4Matrix;
+	MT_CmMatrix4x4						m_OpenGL_4x4Matrix;
 	
 public:
 	virtual void	/* This function should be virtual - derived classed override it */
diff --git a/source/gameengine/Ketsji/KX_IPhysicsController.cpp b/source/gameengine/Ketsji/KX_IPhysicsController.cpp
index 475ae0dfba8..9cc7764227b 100644
--- a/source/gameengine/Ketsji/KX_IPhysicsController.cpp
+++ b/source/gameengine/Ketsji/KX_IPhysicsController.cpp
@@ -1,4 +1,5 @@
 /**
+ * @file KX_IPhysicsController.cpp
  * $Id$
  *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
diff --git a/source/gameengine/Ketsji/KX_KetsjiEngine.h b/source/gameengine/Ketsji/KX_KetsjiEngine.h
index 4246bc28b50..83e0fe229d7 100644
--- a/source/gameengine/Ketsji/KX_KetsjiEngine.h
+++ b/source/gameengine/Ketsji/KX_KetsjiEngine.h
@@ -60,6 +60,9 @@ enum KX_ExitRequestMode
 	KX_EXIT_REQUEST_MAX
 };
 
+/**
+ * KX_KetsjiEngine is the core game engine class.
+ */
 class KX_KetsjiEngine
 {