[Bf-blender-cvs] [43eaf02] temp-bge-cleanup: Special cleanup for BL_ArmatureConstraint

[Porteries Tristan]

Commit: 43eaf02bbf7a6b1e80d78887e63859544c4e2546
Author: Porteries Tristan
Date:   Mon May 4 20:32:07 2015 +0200
Branches: temp-bge-cleanup
https://developer.blender.org/rB43eaf02bbf7a6b1e80d78887e63859544c4e2546

Special cleanup for BL_ArmatureConstraint

===================================================================

M	source/gameengine/Converter/BL_ArmatureConstraint.cpp
M	source/gameengine/Converter/BL_ArmatureConstraint.h

===================================================================

diff --git a/source/gameengine/Converter/BL_ArmatureConstraint.cpp b/source/gameengine/Converter/BL_ArmatureConstraint.cpp
index 9c49544..08e4b3c 100644
--- a/source/gameengine/Converter/BL_ArmatureConstraint.cpp
+++ b/source/gameengine/Converter/BL_ArmatureConstraint.cpp
@@ -74,7 +74,10 @@ BL_ArmatureConstraint::BL_ArmatureConstraint(
     bConstraint *constraint,
     KX_GameObject *target,
     KX_GameObject *subtarget)
-	: PyObjectPlus(), m_constraint(constraint), m_posechannel(posechannel), m_armature(armature)
+	: PyObjectPlus(),
+	m_constraint(constraint),
+	m_posechannel(posechannel),
+	m_armature(armature)
 {
 	m_target = target;
 	m_blendtarget = (target) ? target->GetBlenderObject() : NULL;
@@ -225,7 +228,6 @@ void BL_ArmatureConstraint::SetTarget(KX_GameObject *target)
 				m_target->RegisterObject(m_armature);
 		}
 	}
-
 }
 
 void BL_ArmatureConstraint::SetSubtarget(KX_GameObject *subtarget)
@@ -238,7 +240,6 @@ void BL_ArmatureConstraint::SetSubtarget(KX_GameObject *subtarget)
 				m_subtarget->RegisterObject(m_armature);
 		}
 	}
-
 }
 
 #ifdef WITH_PYTHON
@@ -370,7 +371,7 @@ int BL_ArmatureConstraint::py_attr_setattr(void *self_v, const struct KX_PYATTRI
 	switch (attr_order) {
 		case BCA_ENFORCE:
 			dval = PyFloat_AsDouble(value);
-			if (dval < 0.0 || dval > 1.0) { /* also accounts for non float */
+			if (dval < 0.0f || dval > 1.0f) { /* also accounts for non float */
 				PyErr_SetString(PyExc_AttributeError, "constraint.enforce = float: BL_ArmatureConstraint, expected a float between 0 and 1");
 				return PY_SET_ATTR_FAIL;
 			}
@@ -379,7 +380,7 @@ int BL_ArmatureConstraint::py_attr_setattr(void *self_v, const struct KX_PYATTRI
 
 		case BCA_HEADTAIL:
 			dval = PyFloat_AsDouble(value);
-			if (dval < 0.0 || dval > 1.0) { /* also accounts for non float */
+			if (dval < 0.0f || dval > 1.0f) { /* also accounts for non float */
 				PyErr_SetString(PyExc_AttributeError, "constraint.headtail = float: BL_ArmatureConstraint, expected a float between 0 and 1");
 				return PY_SET_ATTR_FAIL;
 			}
@@ -417,7 +418,7 @@ int BL_ArmatureConstraint::py_attr_setattr(void *self_v, const struct KX_PYATTRI
 			switch (attr_order) {
 				case BCA_IKWEIGHT:
 					dval = PyFloat_AsDouble(value);
-					if (dval < 0.0 || dval > 1.0) { /* also accounts for non float */
+					if (dval < 0.0f || dval > 1.0f) { /* also accounts for non float */
 						PyErr_SetString(PyExc_AttributeError, "constraint.weight = float: BL_ArmatureConstraint, expected a float between 0 and 1");
 						return PY_SET_ATTR_FAIL;
 					}
@@ -426,7 +427,7 @@ int BL_ArmatureConstraint::py_attr_setattr(void *self_v, const struct KX_PYATTRI
 
 				case BCA_IKDIST:
 					dval = PyFloat_AsDouble(value);
-					if (dval < 0.0) { /* also accounts for non float */
+					if (dval < 0.0f) { /* also accounts for non float */
 						PyErr_SetString(PyExc_AttributeError, "constraint.ik_dist = float: BL_ArmatureConstraint, expected a positive float");
 						return PY_SET_ATTR_FAIL;
 					}
diff --git a/source/gameengine/Converter/BL_ArmatureConstraint.h b/source/gameengine/Converter/BL_ArmatureConstraint.h
index b8bb395..1ff83c3 100644
--- a/source/gameengine/Converter/BL_ArmatureConstraint.h
+++ b/source/gameengine/Converter/BL_ArmatureConstraint.h
@@ -55,25 +55,25 @@ class BL_ArmatureConstraint : public PyObjectPlus
 	Py_Header
 
 private:
-	struct bConstraint *m_constraint;
-	struct bPoseChannel *m_posechannel;
-	class BL_ArmatureObject *m_armature;
+	bConstraint *m_constraint;
+	bPoseChannel *m_posechannel;
+	BL_ArmatureObject *m_armature;
 	char m_name[64];
 	KX_GameObject *m_target;
 	KX_GameObject *m_subtarget;
-	struct Object *m_blendtarget;
-	struct Object *m_blendsubtarget;
+	Object *m_blendtarget;
+	Object *m_blendsubtarget;
 	float m_blendmat[4][4];
 	float m_blendsubmat[4][4];
-	struct bPose *m_pose;
-	struct bPose *m_subpose;
+	bPose *m_pose;
+	bPose *m_subpose;
 
 public:
-	BL_ArmatureConstraint(class BL_ArmatureObject *armature,
-							  struct bPoseChannel *posechannel,
-							  struct bConstraint *constraint,
-							  KX_GameObject *target,
-							  KX_GameObject *subtarget);
+	BL_ArmatureConstraint(BL_ArmatureObject *armature,
+						  bPoseChannel *posechannel,
+						  bConstraint *constraint,
+						  KX_GameObject *target,
+						  KX_GameObject *subtarget);
 	virtual ~BL_ArmatureConstraint();
 
 	BL_ArmatureConstraint *GetReplica() const;
@@ -85,7 +85,8 @@ public:
 	void RestoreTarget();
 
 	bool Match(const char *posechannel, const char *constraint);
-	const char *GetName() {
+	const char *GetName()
+	{
 		return m_name;
 	}