1 files changed, 17 insertions, 15 deletions

diff --git a/source/gameengine/Ketsji/KX_SoundActuator.cpp b/source/gameengine/Ketsji/KX_SoundActuator.cpp
index afa5af3bc04..6de1d67bfdb 100644
--- a/source/gameengine/Ketsji/KX_SoundActuator.cpp
+++ b/source/gameengine/Ketsji/KX_SoundActuator.cpp
@@ -285,9 +285,11 @@ PyMethodDef KX_SoundActuator::Methods[] = {
 	{NULL,NULL,NULL,NULL} //Sentinel
 };
 
+PyAttributeDef KX_SoundActuator::Attributes[] = {
+	{ NULL }	//Sentinel
+};
 
-
-PyObject* KX_SoundActuator::_getattr(const STR_String& attr)
+PyObject* KX_SoundActuator::_getattr(const char *attr)
 {
 	_getattr_up(SCA_IActuator);
 }
@@ -302,7 +304,7 @@ PyObject* KX_SoundActuator::PySetFilename(PyObject* self, PyObject* args, PyObje
 	if (!PyArg_ParseTuple(args, "s", &soundName))
 		return NULL;
 
-	Py_Return;
+	Py_RETURN_NONE;
 }
 
 
@@ -332,7 +334,7 @@ PyObject* KX_SoundActuator::PyStartSound(PyObject* self, PyObject* args, PyObjec
 		// To start the sound you must activate the actuator. 
 		// This function is to restart the sound.
 		m_soundObject->StartSound();	
-	Py_Return;
+	Py_RETURN_NONE;
 }         
 
 
@@ -342,7 +344,7 @@ PyObject* KX_SoundActuator::PyPauseSound(PyObject* self, PyObject* args, PyObjec
 	if (m_soundObject)
 		// unfortunately, openal does not implement pause correctly, it is equivalent to a stop
 		m_soundObject->PauseSound();	
-	Py_Return;
+	Py_RETURN_NONE;
 } 
 
 
@@ -351,7 +353,7 @@ PyObject* KX_SoundActuator::PyStopSound(PyObject* self, PyObject* args, PyObject
 {
 	if (m_soundObject)
 		m_soundObject->StopSound();	
-	Py_Return;
+	Py_RETURN_NONE;
 }
 
 
@@ -365,7 +367,7 @@ PyObject* KX_SoundActuator::PySetGain(PyObject* self, PyObject* args, PyObject*
 	if (m_soundObject)
 		m_soundObject->SetGain(gain);
 	
-	Py_Return;
+	Py_RETURN_NONE;
 }         
 
 
@@ -389,7 +391,7 @@ PyObject* KX_SoundActuator::PySetPitch(PyObject* self, PyObject* args, PyObject*
 	if (m_soundObject)
 		m_soundObject->SetPitch(pitch);
 	
-	Py_Return;
+	Py_RETURN_NONE;
 }         
 
 
@@ -413,7 +415,7 @@ PyObject* KX_SoundActuator::PySetRollOffFactor(PyObject* self, PyObject* args, P
 	if (m_soundObject)
 		m_soundObject->SetRollOffFactor(rollofffactor);
 
-	Py_Return;
+	Py_RETURN_NONE;
 }         
 
 
@@ -437,14 +439,14 @@ PyObject* KX_SoundActuator::PySetLooping(PyObject* self, PyObject* args, PyObjec
 	if (m_soundObject)
 		m_soundObject->SetLoopMode(looping);
 	
-	Py_Return;
+	Py_RETURN_NONE;
 }         
 
 
 
 PyObject* KX_SoundActuator::PyGetLooping(PyObject* self, PyObject* args, PyObject* kwds)
 {
-	int looping = (m_soundObject) ? m_soundObject->GetLoopMode() : SND_LOOP_OFF;
+	int looping = (m_soundObject) ? m_soundObject->GetLoopMode() : (int)SND_LOOP_OFF;
 	PyObject* result = PyInt_FromLong(looping);
 	
 	return result;
@@ -465,7 +467,7 @@ PyObject* KX_SoundActuator::PySetPosition(PyObject* self, PyObject* args, PyObje
 	if (m_soundObject)
 		m_soundObject->SetPosition(pos);
 	
-	Py_Return;
+	Py_RETURN_NONE;
 }         
 
 
@@ -483,7 +485,7 @@ PyObject* KX_SoundActuator::PySetVelocity(PyObject* self, PyObject* args, PyObje
 	if (m_soundObject)
 		m_soundObject->SetVelocity(vel);
 	
-	Py_Return;
+	Py_RETURN_NONE;
 }         
 
 
@@ -507,7 +509,7 @@ PyObject* KX_SoundActuator::PySetOrientation(PyObject* self, PyObject* args, PyO
 	if (m_soundObject)
 		m_soundObject->SetOrientation(ori);
 	
-	Py_Return;
+	Py_RETURN_NONE;
 }
 
 PyObject* KX_SoundActuator::PySetType(PyObject* self, PyObject* args, PyObject* kwds)
@@ -523,7 +525,7 @@ PyObject* KX_SoundActuator::PySetType(PyObject* self, PyObject* args, PyObject*
 		m_type = (KX_SOUNDACT_TYPE) typeArg;
 	}
 
-	Py_Return;
+	Py_RETURN_NONE;
 }
 
 PyObject* KX_SoundActuator::PyGetType(PyObject* self, PyObject* args, PyObject* kwds)