From 387439390d2651c6eaea9deb3ad38a250b579e7b Mon Sep 17 00:00:00 2001
From: Mitchell Stokes <mogurijin@gmail.com>
Date: Fri, 29 Jul 2011 21:58:31 +0000
Subject: BGE Animations: Fixing some warnings from GCC about initialization
 order.

---
 source/gameengine/Ketsji/BL_Action.cpp        | 16 ++++++++--------
 source/gameengine/Ketsji/BL_ActionManager.cpp |  2 ++
 source/gameengine/Ketsji/KX_GameObject.cpp    |  4 ++--
 3 files changed, 12 insertions(+), 10 deletions(-)

(limited to 'source')

diff --git a/source/gameengine/Ketsji/BL_Action.cpp b/source/gameengine/Ketsji/BL_Action.cpp
index 6fe989296fd..caffd3cd8ca 100644
--- a/source/gameengine/Ketsji/BL_Action.cpp
+++ b/source/gameengine/Ketsji/BL_Action.cpp
@@ -49,24 +49,24 @@ extern "C" {
 
 BL_Action::BL_Action(class KX_GameObject* gameobj)
 :
+	m_action(NULL),
+	m_pose(NULL),
+	m_blendpose(NULL),
+	m_blendinpose(NULL),
+	m_ptrrna(NULL),
+	m_sg_contr(NULL),
 	m_obj(gameobj),
 	m_startframe(0.f),
 	m_endframe(0.f),
-	m_blendin(0.f),
-	m_playmode(0),
 	m_endtime(0.f),
 	m_localtime(0.f),
+	m_blendin(0.f),
 	m_blendframe(0.f),
 	m_blendstart(0.f),
 	m_speed(0.f),
 	m_priority(0),
+	m_playmode(0),
 	m_ipo_flags(0),
-	m_pose(NULL),
-	m_blendpose(NULL),
-	m_blendinpose(NULL),
-	m_sg_contr(NULL),
-	m_ptrrna(NULL),
-	m_action(NULL),
 	m_done(true)
 {
 	if (m_obj->GetGameObjectType() == SCA_IObject::OBJ_ARMATURE)
diff --git a/source/gameengine/Ketsji/BL_ActionManager.cpp b/source/gameengine/Ketsji/BL_ActionManager.cpp
index 0586c515c65..74a98b11024 100644
--- a/source/gameengine/Ketsji/BL_ActionManager.cpp
+++ b/source/gameengine/Ketsji/BL_ActionManager.cpp
@@ -59,6 +59,8 @@ struct bAction *BL_ActionManager::GetCurrentAction(short layer)
 {
 	if (m_layers[layer])
 		return m_layers[layer]->GetAction();
+	
+	return NULL;
 }
 
 bool BL_ActionManager::PlayAction(const char* name,
diff --git a/source/gameengine/Ketsji/KX_GameObject.cpp b/source/gameengine/Ketsji/KX_GameObject.cpp
index 4d841e78d70..91e62442646 100644
--- a/source/gameengine/Ketsji/KX_GameObject.cpp
+++ b/source/gameengine/Ketsji/KX_GameObject.cpp
@@ -109,8 +109,8 @@ KX_GameObject::KX_GameObject(
 	m_pGraphicController(NULL),
 	m_xray(false),
 	m_pHitObject(NULL),
-	m_isDeformable(false),
-	m_actionManager(NULL)
+    m_actionManager(NULL),
+	m_isDeformable(false)
 #ifdef WITH_PYTHON
 	, m_attr_dict(NULL)
 #endif
-- 
cgit v1.2.3