1 files changed, 19 insertions, 15 deletions

diff --git a/source/gameengine/Ketsji/KX_ObjectActuator.cpp b/source/gameengine/Ketsji/KX_ObjectActuator.cpp
index 98e73d4f0d7..0666261b470 100644
--- a/source/gameengine/Ketsji/KX_ObjectActuator.cpp
+++ b/source/gameengine/Ketsji/KX_ObjectActuator.cpp
@@ -65,12 +65,12 @@ KX_ObjectActuator(
 	m_current_linear_factor(0.0),
 	m_current_angular_factor(0.0),
 	m_damping(damping),
+	m_previous_error(0.0,0.0,0.0),
+	m_error_accumulator(0.0,0.0,0.0),
 	m_bitLocalFlag (flag),
 	m_active_combined_velocity (false),
 	m_linear_damping_active(false),
-	m_angular_damping_active(false),
-	m_error_accumulator(0.0,0.0,0.0),
-	m_previous_error(0.0,0.0,0.0)
+	m_angular_damping_active(false)
 {
 	if (m_bitLocalFlag.ServoControl)
 	{
@@ -332,7 +332,11 @@ PyMethodDef KX_ObjectActuator::Methods[] = {
 	{NULL,NULL} //Sentinel
 };
 
-PyObject* KX_ObjectActuator::_getattr(const STR_String& attr) {
+PyAttributeDef KX_ObjectActuator::Attributes[] = {
+	{ NULL }	//Sentinel
+};
+
+PyObject* KX_ObjectActuator::_getattr(const char *attr) {
 	_getattr_up(SCA_IActuator);
 };
 
@@ -365,7 +369,7 @@ PyObject* KX_ObjectActuator::PySetForce(PyObject* self,
 	m_force.setValue(vecArg);
 	m_bitLocalFlag.Force = PyArgToBool(bToggle);
 	UpdateFuzzyFlags();
-	Py_Return;
+	Py_RETURN_NONE;
 }
 
 /* 4. getTorque                                                              */
@@ -394,7 +398,7 @@ PyObject* KX_ObjectActuator::PySetTorque(PyObject* self,
 	m_torque.setValue(vecArg);
 	m_bitLocalFlag.Torque = PyArgToBool(bToggle);
 	UpdateFuzzyFlags();
-	Py_Return;
+	Py_RETURN_NONE;
 }
 
 /* 6. getDLoc                                                                */
@@ -423,7 +427,7 @@ PyObject* KX_ObjectActuator::PySetDLoc(PyObject* self,
 	m_dloc.setValue(vecArg);
 	m_bitLocalFlag.DLoc = PyArgToBool(bToggle);
 	UpdateFuzzyFlags();
-	Py_Return;
+	Py_RETURN_NONE;
 }
 
 /* 8. getDRot                                                                */
@@ -452,7 +456,7 @@ PyObject* KX_ObjectActuator::PySetDRot(PyObject* self,
 	m_drot.setValue(vecArg);
 	m_bitLocalFlag.DRot = PyArgToBool(bToggle);
 	UpdateFuzzyFlags();
-	Py_Return;
+	Py_RETURN_NONE;
 }
 
 /* 10. getLinearVelocity                                                 */
@@ -480,7 +484,7 @@ PyObject* KX_ObjectActuator::PySetLinearVelocity(PyObject* self,
 	m_linear_velocity.setValue(vecArg);
 	m_bitLocalFlag.LinearVelocity = PyArgToBool(bToggle);
 	UpdateFuzzyFlags();
-	Py_Return;
+	Py_RETURN_NONE;
 }
 
 
@@ -508,7 +512,7 @@ PyObject* KX_ObjectActuator::PySetAngularVelocity(PyObject* self,
 	m_angular_velocity.setValue(vecArg);
 	m_bitLocalFlag.AngularVelocity = PyArgToBool(bToggle);
 	UpdateFuzzyFlags();
-	Py_Return;
+	Py_RETURN_NONE;
 }
 
 /* 13. setDamping                                                */
@@ -520,7 +524,7 @@ PyObject* KX_ObjectActuator::PySetDamping(PyObject* self,
 		return NULL;
 	}
 	m_damping = damping;
-	Py_Return;
+	Py_RETURN_NONE;
 }
 
 /* 13. getVelocityDamping                                                */
@@ -551,7 +555,7 @@ PyObject* KX_ObjectActuator::PySetForceLimitX(PyObject* self,
 	m_drot[0] = vecArg[0];
 	m_dloc[0] = vecArg[1];
 	m_bitLocalFlag.Torque = PyArgToBool(bToggle);
-	Py_Return;
+	Py_RETURN_NONE;
 }
 
 /* 6. getForceLimitY                                                                */
@@ -578,7 +582,7 @@ PyObject* KX_ObjectActuator::PySetForceLimitY(PyObject* self,
 	m_drot[1] = vecArg[0];
 	m_dloc[1] = vecArg[1];
 	m_bitLocalFlag.DLoc = PyArgToBool(bToggle);
-	Py_Return;
+	Py_RETURN_NONE;
 }
 
 /* 6. getForceLimitZ                                                                */
@@ -605,7 +609,7 @@ PyObject* KX_ObjectActuator::PySetForceLimitZ(PyObject* self,
 	m_drot[2] = vecArg[0];
 	m_dloc[2] = vecArg[1];
 	m_bitLocalFlag.DRot = PyArgToBool(bToggle);
-	Py_Return;
+	Py_RETURN_NONE;
 }
 
 /* 4. getPID                                                              */
@@ -629,7 +633,7 @@ PyObject* KX_ObjectActuator::PySetPID(PyObject* self,
 		return NULL;
 	}
 	m_torque.setValue(vecArg);
-	Py_Return;
+	Py_RETURN_NONE;
 }