diff options
author | Erwin Coumans <blender@erwincoumans.com> | 2005-11-28 09:51:54 +0300 |
---|---|---|
committer | Erwin Coumans <blender@erwincoumans.com> | 2005-11-28 09:51:54 +0300 |
commit | e1c66eb14509c9f6f4c59edd8a541e3d49d90cef (patch) | |
tree | 3237f6c534b1e7a5a801bb327f55de35425ff5e4 /source/gameengine/Ketsji/KX_GameObject.cpp | |
parent | 427cae9eebaceeac80f8e7a151661aa36f18db01 (diff) |
applied the 64-bit pointer patch submitted by Ken Hughes
Diffstat (limited to 'source/gameengine/Ketsji/KX_GameObject.cpp')
-rw-r--r-- | source/gameengine/Ketsji/KX_GameObject.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/source/gameengine/Ketsji/KX_GameObject.cpp b/source/gameengine/Ketsji/KX_GameObject.cpp index da81439fccb..93917151932 100644 --- a/source/gameengine/Ketsji/KX_GameObject.cpp +++ b/source/gameengine/Ketsji/KX_GameObject.cpp @@ -35,6 +35,12 @@ #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. @@ -1068,12 +1074,12 @@ PyObject* KX_GameObject::PyGetPhysicsId(PyObject* self, PyObject* kwds) { KX_IPhysicsController* ctrl = GetPhysicsController(); - int physid=0; + uint_ptr physid=0; if (ctrl) { - physid= (int)ctrl->GetUserData(); + physid= (uint_ptr)ctrl->GetUserData(); } - return PyInt_FromLong(physid); + return PyInt_FromLong((long)physid); } KX_PYMETHODDEF_DOC(KX_GameObject, getDistanceTo, |