use PyList_SET_ITEM instead of PyList_SetItem,

PyList_SetItem does error checking and decref's existing values, PyList_SET_ITEM is a macro for direct assignment, only for use on new lists.

7 files changed, 61 insertions, 61 deletions

diff --git a/source/gameengine/Expressions/PyObjectPlus.cpp b/source/gameengine/Expressions/PyObjectPlus.cpp
index c4daaff2dd1..96753d56d94 100644
--- a/source/gameengine/Expressions/PyObjectPlus.cpp
+++ b/source/gameengine/Expressions/PyObjectPlus.cpp
@@ -240,14 +240,14 @@ PyObject *PyObjectPlus::py_get_attrdef(void *self, const PyAttributeDef *attrdef
 				{
 					bool *val = reinterpret_cast<bool*>(ptr);
 					ptr += sizeof(bool);
-					PyList_SetItem(resultlist,i,PyInt_FromLong(*val));
+					PyList_SET_ITEM(resultlist,i,PyInt_FromLong(*val));
 					break;
 				}
 			case KX_PYATTRIBUTE_TYPE_SHORT:
 				{
 					short int *val = reinterpret_cast<short int*>(ptr);
 					ptr += sizeof(short int);
-					PyList_SetItem(resultlist,i,PyInt_FromLong(*val));
+					PyList_SET_ITEM(resultlist,i,PyInt_FromLong(*val));
 					break;
 				}
 			case KX_PYATTRIBUTE_TYPE_ENUM:
@@ -262,14 +262,14 @@ PyObject *PyObjectPlus::py_get_attrdef(void *self, const PyAttributeDef *attrdef
 				{
 					int *val = reinterpret_cast<int*>(ptr);
 					ptr += sizeof(int);
-					PyList_SetItem(resultlist,i,PyInt_FromLong(*val));
+					PyList_SET_ITEM(resultlist,i,PyInt_FromLong(*val));
 					break;
 				}
 			case KX_PYATTRIBUTE_TYPE_FLOAT:
 				{
 					float *val = reinterpret_cast<float*>(ptr);
 					ptr += sizeof(float);
-					PyList_SetItem(resultlist,i,PyFloat_FromDouble(*val));
+					PyList_SET_ITEM(resultlist,i,PyFloat_FromDouble(*val));
 					break;
 				}
 			default:
diff --git a/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp b/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
index 96969dc6dc7..2048731f73c 100644
--- a/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
+++ b/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
@@ -694,7 +694,7 @@ PyObject* SCA_KeyboardSensor::pyattr_get_events(void *self_v, const KX_PYATTRIBU
 		{
 			PyObject* keypair = PyList_New(2);
 			PyList_SET_ITEM(keypair,0,PyInt_FromLong(i));
-			PyList_SetItem(keypair,1,PyInt_FromLong(inevent.m_status));
+			PyList_SET_ITEM(keypair,1,PyInt_FromLong(inevent.m_status));
 			PyList_Append(resultlist,keypair);
 		}
 	}	
diff --git a/source/gameengine/Ketsji/KX_ConstraintActuator.cpp b/source/gameengine/Ketsji/KX_ConstraintActuator.cpp
index 00fed43cbe8..34102132db8 100644
--- a/source/gameengine/Ketsji/KX_ConstraintActuator.cpp
+++ b/source/gameengine/Ketsji/KX_ConstraintActuator.cpp
@@ -754,9 +754,9 @@ PyObject* KX_ConstraintActuator::PyGetDirection(){
 	ShowDeprecationWarning("getDirection()", "the direction property");
 	PyObject *retVal = PyList_New(3);
 
-	PyList_SetItem(retVal, 0, PyFloat_FromDouble(m_refDirection[0]));
-	PyList_SetItem(retVal, 1, PyFloat_FromDouble(m_refDirection[1]));
-	PyList_SetItem(retVal, 2, PyFloat_FromDouble(m_refDirection[2]));
+	PyList_SET_ITEM(retVal, 0, PyFloat_FromDouble(m_refDirection[0]));
+	PyList_SET_ITEM(retVal, 1, PyFloat_FromDouble(m_refDirection[1]));
+	PyList_SET_ITEM(retVal, 2, PyFloat_FromDouble(m_refDirection[2]));
 	return retVal;
 }
 
diff --git a/source/gameengine/Ketsji/KX_ObjectActuator.cpp b/source/gameengine/Ketsji/KX_ObjectActuator.cpp
index c115a8f33bc..ed5539709e4 100644
--- a/source/gameengine/Ketsji/KX_ObjectActuator.cpp
+++ b/source/gameengine/Ketsji/KX_ObjectActuator.cpp
@@ -352,10 +352,10 @@ PyObject* KX_ObjectActuator::PyGetForce()
 {
 	PyObject *retVal = PyList_New(4);
 
-	PyList_SetItem(retVal, 0, PyFloat_FromDouble(m_force[0]));
-	PyList_SetItem(retVal, 1, PyFloat_FromDouble(m_force[1]));
-	PyList_SetItem(retVal, 2, PyFloat_FromDouble(m_force[2]));
-	PyList_SetItem(retVal, 3, BoolToPyArg(m_bitLocalFlag.Force));
+	PyList_SET_ITEM(retVal, 0, PyFloat_FromDouble(m_force[0]));
+	PyList_SET_ITEM(retVal, 1, PyFloat_FromDouble(m_force[1]));
+	PyList_SET_ITEM(retVal, 2, PyFloat_FromDouble(m_force[2]));
+	PyList_SET_ITEM(retVal, 3, BoolToPyArg(m_bitLocalFlag.Force));
 	
 	return retVal;
 }
@@ -379,10 +379,10 @@ PyObject* KX_ObjectActuator::PyGetTorque()
 {
 	PyObject *retVal = PyList_New(4);
 
-	PyList_SetItem(retVal, 0, PyFloat_FromDouble(m_torque[0]));
-	PyList_SetItem(retVal, 1, PyFloat_FromDouble(m_torque[1]));
-	PyList_SetItem(retVal, 2, PyFloat_FromDouble(m_torque[2]));
-	PyList_SetItem(retVal, 3, BoolToPyArg(m_bitLocalFlag.Torque));
+	PyList_SET_ITEM(retVal, 0, PyFloat_FromDouble(m_torque[0]));
+	PyList_SET_ITEM(retVal, 1, PyFloat_FromDouble(m_torque[1]));
+	PyList_SET_ITEM(retVal, 2, PyFloat_FromDouble(m_torque[2]));
+	PyList_SET_ITEM(retVal, 3, BoolToPyArg(m_bitLocalFlag.Torque));
 	
 	return retVal;
 }
@@ -406,10 +406,10 @@ PyObject* KX_ObjectActuator::PyGetDLoc()
 {
 	PyObject *retVal = PyList_New(4);
 
-	PyList_SetItem(retVal, 0, PyFloat_FromDouble(m_dloc[0]));
-	PyList_SetItem(retVal, 1, PyFloat_FromDouble(m_dloc[1]));
-	PyList_SetItem(retVal, 2, PyFloat_FromDouble(m_dloc[2]));
-	PyList_SetItem(retVal, 3, BoolToPyArg(m_bitLocalFlag.DLoc));
+	PyList_SET_ITEM(retVal, 0, PyFloat_FromDouble(m_dloc[0]));
+	PyList_SET_ITEM(retVal, 1, PyFloat_FromDouble(m_dloc[1]));
+	PyList_SET_ITEM(retVal, 2, PyFloat_FromDouble(m_dloc[2]));
+	PyList_SET_ITEM(retVal, 3, BoolToPyArg(m_bitLocalFlag.DLoc));
 	
 	return retVal;
 }
@@ -433,10 +433,10 @@ PyObject* KX_ObjectActuator::PyGetDRot()
 {
 	PyObject *retVal = PyList_New(4);
 
-	PyList_SetItem(retVal, 0, PyFloat_FromDouble(m_drot[0]));
-	PyList_SetItem(retVal, 1, PyFloat_FromDouble(m_drot[1]));
-	PyList_SetItem(retVal, 2, PyFloat_FromDouble(m_drot[2]));
-	PyList_SetItem(retVal, 3, BoolToPyArg(m_bitLocalFlag.DRot));
+	PyList_SET_ITEM(retVal, 0, PyFloat_FromDouble(m_drot[0]));
+	PyList_SET_ITEM(retVal, 1, PyFloat_FromDouble(m_drot[1]));
+	PyList_SET_ITEM(retVal, 2, PyFloat_FromDouble(m_drot[2]));
+	PyList_SET_ITEM(retVal, 3, BoolToPyArg(m_bitLocalFlag.DRot));
 	
 	return retVal;
 }
@@ -459,10 +459,10 @@ PyObject* KX_ObjectActuator::PySetDRot(PyObject* args)
 PyObject* KX_ObjectActuator::PyGetLinearVelocity() {
 	PyObject *retVal = PyList_New(4);
 
-	PyList_SetItem(retVal, 0, PyFloat_FromDouble(m_linear_velocity[0]));
-	PyList_SetItem(retVal, 1, PyFloat_FromDouble(m_linear_velocity[1]));
-	PyList_SetItem(retVal, 2, PyFloat_FromDouble(m_linear_velocity[2]));
-	PyList_SetItem(retVal, 3, BoolToPyArg(m_bitLocalFlag.LinearVelocity));
+	PyList_SET_ITEM(retVal, 0, PyFloat_FromDouble(m_linear_velocity[0]));
+	PyList_SET_ITEM(retVal, 1, PyFloat_FromDouble(m_linear_velocity[1]));
+	PyList_SET_ITEM(retVal, 2, PyFloat_FromDouble(m_linear_velocity[2]));
+	PyList_SET_ITEM(retVal, 3, BoolToPyArg(m_bitLocalFlag.LinearVelocity));
 	
 	return retVal;
 }
@@ -486,10 +486,10 @@ PyObject* KX_ObjectActuator::PySetLinearVelocity(PyObject* args) {
 PyObject* KX_ObjectActuator::PyGetAngularVelocity() {
 	PyObject *retVal = PyList_New(4);
 
-	PyList_SetItem(retVal, 0, PyFloat_FromDouble(m_angular_velocity[0]));
-	PyList_SetItem(retVal, 1, PyFloat_FromDouble(m_angular_velocity[1]));
-	PyList_SetItem(retVal, 2, PyFloat_FromDouble(m_angular_velocity[2]));
-	PyList_SetItem(retVal, 3, BoolToPyArg(m_bitLocalFlag.AngularVelocity));
+	PyList_SET_ITEM(retVal, 0, PyFloat_FromDouble(m_angular_velocity[0]));
+	PyList_SET_ITEM(retVal, 1, PyFloat_FromDouble(m_angular_velocity[1]));
+	PyList_SET_ITEM(retVal, 2, PyFloat_FromDouble(m_angular_velocity[2]));
+	PyList_SET_ITEM(retVal, 3, BoolToPyArg(m_bitLocalFlag.AngularVelocity));
 	
 	return retVal;
 }
@@ -526,9 +526,9 @@ PyObject* KX_ObjectActuator::PyGetForceLimitX()
 {
 	PyObject *retVal = PyList_New(3);
 
-	PyList_SetItem(retVal, 0, PyFloat_FromDouble(m_drot[0]));
-	PyList_SetItem(retVal, 1, PyFloat_FromDouble(m_dloc[0]));
-	PyList_SetItem(retVal, 2, BoolToPyArg(m_bitLocalFlag.Torque));
+	PyList_SET_ITEM(retVal, 0, PyFloat_FromDouble(m_drot[0]));
+	PyList_SET_ITEM(retVal, 1, PyFloat_FromDouble(m_dloc[0]));
+	PyList_SET_ITEM(retVal, 2, BoolToPyArg(m_bitLocalFlag.Torque));
 	
 	return retVal;
 }
@@ -551,9 +551,9 @@ PyObject* KX_ObjectActuator::PyGetForceLimitY()
 {
 	PyObject *retVal = PyList_New(3);
 
-	PyList_SetItem(retVal, 0, PyFloat_FromDouble(m_drot[1]));
-	PyList_SetItem(retVal, 1, PyFloat_FromDouble(m_dloc[1]));
-	PyList_SetItem(retVal, 2, BoolToPyArg(m_bitLocalFlag.DLoc));
+	PyList_SET_ITEM(retVal, 0, PyFloat_FromDouble(m_drot[1]));
+	PyList_SET_ITEM(retVal, 1, PyFloat_FromDouble(m_dloc[1]));
+	PyList_SET_ITEM(retVal, 2, BoolToPyArg(m_bitLocalFlag.DLoc));
 	
 	return retVal;
 }
@@ -576,9 +576,9 @@ PyObject* KX_ObjectActuator::PyGetForceLimitZ()
 {
 	PyObject *retVal = PyList_New(3);
 
-	PyList_SetItem(retVal, 0, PyFloat_FromDouble(m_drot[2]));
-	PyList_SetItem(retVal, 1, PyFloat_FromDouble(m_dloc[2]));
-	PyList_SetItem(retVal, 2, BoolToPyArg(m_bitLocalFlag.DRot));
+	PyList_SET_ITEM(retVal, 0, PyFloat_FromDouble(m_drot[2]));
+	PyList_SET_ITEM(retVal, 1, PyFloat_FromDouble(m_dloc[2]));
+	PyList_SET_ITEM(retVal, 2, BoolToPyArg(m_bitLocalFlag.DRot));
 	
 	return retVal;
 }
@@ -601,9 +601,9 @@ PyObject* KX_ObjectActuator::PyGetPID()
 {
 	PyObject *retVal = PyList_New(3);
 
-	PyList_SetItem(retVal, 0, PyFloat_FromDouble(m_torque[0]));
-	PyList_SetItem(retVal, 1, PyFloat_FromDouble(m_torque[1]));
-	PyList_SetItem(retVal, 2, PyFloat_FromDouble(m_torque[2]));
+	PyList_SET_ITEM(retVal, 0, PyFloat_FromDouble(m_torque[0]));
+	PyList_SET_ITEM(retVal, 1, PyFloat_FromDouble(m_torque[1]));
+	PyList_SET_ITEM(retVal, 2, PyFloat_FromDouble(m_torque[2]));
 	
 	return retVal;
 }
diff --git a/source/gameengine/Ketsji/KX_PythonInit.cpp b/source/gameengine/Ketsji/KX_PythonInit.cpp
index 9649e50a98b..873e49be6bb 100644
--- a/source/gameengine/Ketsji/KX_PythonInit.cpp
+++ b/source/gameengine/Ketsji/KX_PythonInit.cpp
@@ -216,13 +216,13 @@ static PyObject* gPyGetSpectrum(PyObject*)
 
 		for (int index = 0; index < 512; index++)
 		{
-			PyList_SetItem(resultlist, index, PyFloat_FromDouble(spectrum[index]));
+			PyList_SET_ITEM(resultlist, index, PyFloat_FromDouble(spectrum[index]));
 		}
 	}
 	else {
 		for (int index = 0; index < 512; index++)
 		{
-			PyList_SetItem(resultlist, index, PyFloat_FromDouble(0.0));
+			PyList_SET_ITEM(resultlist, index, PyFloat_FromDouble(0.0));
 		}
 	}
 
diff --git a/source/gameengine/Ketsji/KX_RadarSensor.cpp b/source/gameengine/Ketsji/KX_RadarSensor.cpp
index d1075f9b296..d06728c1d4d 100644
--- a/source/gameengine/Ketsji/KX_RadarSensor.cpp
+++ b/source/gameengine/Ketsji/KX_RadarSensor.cpp
@@ -212,9 +212,9 @@ PyObject* KX_RadarSensor::PyGetConeOrigin() {
 
 	PyObject *retVal = PyList_New(3);
 	
-	PyList_SetItem(retVal, 0, PyFloat_FromDouble(m_cone_origin[0]));
-	PyList_SetItem(retVal, 1, PyFloat_FromDouble(m_cone_origin[1]));
-	PyList_SetItem(retVal, 2, PyFloat_FromDouble(m_cone_origin[2]));
+	PyList_SET_ITEM(retVal, 0, PyFloat_FromDouble(m_cone_origin[0]));
+	PyList_SET_ITEM(retVal, 1, PyFloat_FromDouble(m_cone_origin[1]));
+	PyList_SET_ITEM(retVal, 2, PyFloat_FromDouble(m_cone_origin[2]));
 	
 	return retVal;
 }
@@ -228,9 +228,9 @@ PyObject* KX_RadarSensor::PyGetConeTarget() {
 
 	PyObject *retVal = PyList_New(3);
 	
-	PyList_SetItem(retVal, 0, PyFloat_FromDouble(m_cone_target[0]));
-	PyList_SetItem(retVal, 1, PyFloat_FromDouble(m_cone_target[1]));
-	PyList_SetItem(retVal, 2, PyFloat_FromDouble(m_cone_target[2]));
+	PyList_SET_ITEM(retVal, 0, PyFloat_FromDouble(m_cone_target[0]));
+	PyList_SET_ITEM(retVal, 1, PyFloat_FromDouble(m_cone_target[1]));
+	PyList_SET_ITEM(retVal, 2, PyFloat_FromDouble(m_cone_target[2]));
 	
 	return retVal;
 }
diff --git a/source/gameengine/Ketsji/KX_RaySensor.cpp b/source/gameengine/Ketsji/KX_RaySensor.cpp
index 360aa1a85a8..bee644b6a30 100644
--- a/source/gameengine/Ketsji/KX_RaySensor.cpp
+++ b/source/gameengine/Ketsji/KX_RaySensor.cpp
@@ -404,9 +404,9 @@ PyObject* KX_RaySensor::PyGetHitPosition()
 
 	PyObject *retVal = PyList_New(3);
 
-	PyList_SetItem(retVal, 0, PyFloat_FromDouble(m_hitPosition[0]));
-	PyList_SetItem(retVal, 1, PyFloat_FromDouble(m_hitPosition[1]));
-	PyList_SetItem(retVal, 2, PyFloat_FromDouble(m_hitPosition[2]));
+	PyList_SET_ITEM(retVal, 0, PyFloat_FromDouble(m_hitPosition[0]));
+	PyList_SET_ITEM(retVal, 1, PyFloat_FromDouble(m_hitPosition[1]));
+	PyList_SET_ITEM(retVal, 2, PyFloat_FromDouble(m_hitPosition[2]));
 
 	return retVal;
 }
@@ -420,9 +420,9 @@ PyObject* KX_RaySensor::PyGetRayDirection()
 
 	PyObject *retVal = PyList_New(3);
 	
-	PyList_SetItem(retVal, 0, PyFloat_FromDouble(m_rayDirection[0]));
-	PyList_SetItem(retVal, 1, PyFloat_FromDouble(m_rayDirection[1]));
-	PyList_SetItem(retVal, 2, PyFloat_FromDouble(m_rayDirection[2]));
+	PyList_SET_ITEM(retVal, 0, PyFloat_FromDouble(m_rayDirection[0]));
+	PyList_SET_ITEM(retVal, 1, PyFloat_FromDouble(m_rayDirection[1]));
+	PyList_SET_ITEM(retVal, 2, PyFloat_FromDouble(m_rayDirection[2]));
 
 	return retVal;
 }
@@ -436,9 +436,9 @@ PyObject* KX_RaySensor::PyGetHitNormal()
 
 	PyObject *retVal = PyList_New(3);
 
-	PyList_SetItem(retVal, 0, PyFloat_FromDouble(m_hitNormal[0]));
-	PyList_SetItem(retVal, 1, PyFloat_FromDouble(m_hitNormal[1]));
-	PyList_SetItem(retVal, 2, PyFloat_FromDouble(m_hitNormal[2]));
+	PyList_SET_ITEM(retVal, 0, PyFloat_FromDouble(m_hitNormal[0]));
+	PyList_SET_ITEM(retVal, 1, PyFloat_FromDouble(m_hitNormal[1]));
+	PyList_SET_ITEM(retVal, 2, PyFloat_FromDouble(m_hitNormal[2]));
 
 	return retVal;
 }