Tuesday merger of bf-blender into orange branch.
[blender-staging.git] / source / gameengine / Ketsji / KX_GameObject.cpp
index 42e5d550e57624976f913c4d4ab4347706bffc51..a338e3c03d1dd11b7ab191bc6b8a19da78e3e5bf 100644 (file)
 #include <config.h>
 #endif
 
-#if defined(_WIN64)
-typedef unsigned __int64 uint_ptr;
-#else
-typedef unsigned long uint_ptr;
-#endif
-
 #ifdef WIN32
 // This warning tells us about truncation of __long__ stl-generated names.
 // It can occasionally cause DevStudio to have internal compiler warnings.
@@ -1101,12 +1095,12 @@ PyObject* KX_GameObject::PyGetPhysicsId(PyObject* self,
                                                                                           PyObject* kwds)
 {
        KX_IPhysicsController* ctrl = GetPhysicsController();
-       uint_ptr physid=0;
+       int physid=0;
        if (ctrl)
        {
-               physid= (uint_ptr)ctrl->GetUserData();
+               physid= (int)ctrl->GetUserData();
        }
-       return PyInt_FromLong((long)physid);
+       return PyInt_FromLong(physid);
 }
 
 KX_PYMETHODDEF_DOC(KX_GameObject, getDistanceTo,