Undo revision 23130 which was a merge with 2.5, a messy one because I did something...
[blender.git] / source / gameengine / Ketsji / KX_RadarSensor.cpp
index e39d3756b716b30bf8088ad369f38bb0e4cadec9..d020a2544d2ee0c79237642ff86ddae3d7949c6d 100644 (file)
@@ -48,8 +48,7 @@ KX_RadarSensor::KX_RadarSensor(SCA_EventManager* eventmgr,
                        double margin,
                        double resetmargin,
                        bool bFindMaterial,
-                       const STR_String& touchedpropname,
-                       class KX_Scene* kxscene)
+                       const STR_String& touchedpropname)
 
                        : KX_NearSensor(
                                eventmgr,
@@ -59,7 +58,6 @@ KX_RadarSensor::KX_RadarSensor(SCA_EventManager* eventmgr,
                                resetmargin,
                                bFindMaterial,
                                touchedpropname,
-                               kxscene,
                                physCtrl),
 
                                m_coneradius(coneradius),
@@ -228,13 +226,7 @@ PyObject* KX_RadarSensor::PyGetConeHeight() {
 /* Python Integration Hooks                                                  */
 /* ------------------------------------------------------------------------- */
 PyTypeObject KX_RadarSensor::Type = {
-#if (PY_VERSION_HEX >= 0x02060000)
        PyVarObject_HEAD_INIT(NULL, 0)
-#else
-       /* python 2.5 and below */
-       PyObject_HEAD_INIT( NULL )  /* required py macro */
-       0,                          /* ob_size */
-#endif
        "KX_RadarSensor",
        sizeof(PyObjectPlus_Proxy),
        0,
@@ -258,11 +250,11 @@ PyTypeObject KX_RadarSensor::Type = {
 PyMethodDef KX_RadarSensor::Methods[] = {
        //Deprecated ----->
        {"getConeOrigin", (PyCFunction) KX_RadarSensor::sPyGetConeOrigin, 
-        METH_VARARGS, (PY_METHODCHAR)GetConeOrigin_doc},
+        METH_VARARGS, (const char *)GetConeOrigin_doc},
        {"getConeTarget", (PyCFunction) KX_RadarSensor::sPyGetConeTarget, 
-        METH_VARARGS, (PY_METHODCHAR)GetConeTarget_doc},
+        METH_VARARGS, (const char *)GetConeTarget_doc},
        {"getConeHeight", (PyCFunction) KX_RadarSensor::sPyGetConeHeight, 
-        METH_VARARGS, (PY_METHODCHAR)GetConeHeight_doc},
+        METH_VARARGS, (const char *)GetConeHeight_doc},
         //<-----
        {NULL} //Sentinel
 };