From e1c66eb14509c9f6f4c59edd8a541e3d49d90cef Mon Sep 17 00:00:00 2001 From: Erwin Coumans Date: Mon, 28 Nov 2005 06:51:54 +0000 Subject: applied the 64-bit pointer patch submitted by Ken Hughes --- source/gameengine/Ketsji/KX_ObColorIpoSGController.cpp | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'source/gameengine/Ketsji/KX_ObColorIpoSGController.cpp') diff --git a/source/gameengine/Ketsji/KX_ObColorIpoSGController.cpp b/source/gameengine/Ketsji/KX_ObColorIpoSGController.cpp index 58c1494724c..b6d385da8ca 100644 --- a/source/gameengine/Ketsji/KX_ObColorIpoSGController.cpp +++ b/source/gameengine/Ketsji/KX_ObColorIpoSGController.cpp @@ -37,6 +37,13 @@ #include #endif +#if defined(_WIN64) +typedef unsigned __int64 uint_ptr; +#else +typedef unsigned long uint_ptr; +#endif + + bool KX_ObColorIpoSGController::Update(double currentTime) { if (m_modified) @@ -87,10 +94,10 @@ SG_Controller* KX_ObColorIpoSGController::GetReplica(class SG_Node* destnode) iporeplica->AddInterpolator(copyipo); MT_Scalar* scaal = ((KX_ScalarInterpolator*)*i)->GetTarget(); - int orgbase = (int)this; - int orgloc = (int)scaal; - int offset = orgloc-orgbase; - int newaddrbase = (int)iporeplica + offset; + uint_ptr orgbase = (uint_ptr)this; + uint_ptr orgloc = (uint_ptr)scaal; + uint_ptr offset = orgloc-orgbase; + uint_ptr newaddrbase = (uint_ptr)iporeplica + offset; MT_Scalar* blaptr = (MT_Scalar*) newaddrbase; copyipo->SetNewTarget((MT_Scalar*)blaptr); } -- cgit v1.2.3