Attachment #149402 for bug #217299

View | Details | Raw Unified | Return to bug 217299
Collapse All | Expand All

Lines 520-526 Link Here

(-)src.old/OgreOdeBody.cpp (-2 / +2 lines)
520	//-----------------------------------------------------------------------	520	//-----------------------------------------------------------------------
521	Joint* Body::getJoint(int index)	521	Joint* Body::getJoint(int index)
522	{	522	{
523	return (Joint*)_world->getJointList().findItem((unsigned int)dBodyGetJoint(_body,index));	523	return (Joint*)_world->getJointList().findItem((unsigned long)dBodyGetJoint(_body,index));
524	}	524	}
525	//-----------------------------------------------------------------------	525	//-----------------------------------------------------------------------
526	size_t Body::getGeometryCount()	526	size_t Body::getGeometryCount()
Lines 717-723 Link Here
717	destroyDebugNode();	717	destroyDebugNode();
718	delete _mass;	718	delete _mass;
719		719
720	_world->getBodyList().unregisterItem((unsigned int)_body);	720	_world->getBodyList().unregisterItem((unsigned long)_body);
721	dBodyDestroy(_body);	721	dBodyDestroy(_body);
722	}	722	}
723		723




    {
        _debug_contacts = new DebugContact*[_max_contacts];
        for (unsigned int i = 0; i < _max_contacts; i++)
            _debug_contacts[i] = new DebugContact(Ogre::StringConverter::toString((long)_geom) + 
                                                    "_Contact_" + 
                                                    Ogre::StringConverter::toString(i),
                                                    _world);

//------------------------------------------------------------------------------------------------
Space* Geometry::getSpace()
{
	return (Space*)_world->getSpaceList().findItem((unsigned long)dGeomGetSpace(_geom));
}



        }
        _debug_contacts = new DebugContact*[max_contacts];
        for (unsigned int i = 0; i < max_contacts; i++)
            _debug_contacts[i] = new DebugContact(Ogre::StringConverter::toString((long)_geom) +  + "_Contact_" + Ogre::StringConverter::toString(i),
            _world);
    }
    _max_contacts = max_contacts;

Lines 35-41 Link Here

(-)src.old/OgreOdeJoint.cpp (-1 / +1 lines)
35		35
36	JointGroup::~JointGroup()	36	JointGroup::~JointGroup()
37	{	37	{
38	_world->getJointGroupList().unregisterItem((unsigned int)_joint_group);	38	_world->getJointGroupList().unregisterItem((unsigned long)_joint_group);
39	dJointGroupDestroy(_joint_group);	39	dJointGroupDestroy(_joint_group);
40	}	40	}
41		41

Lines 62-68 Link Here

(-)src.old/OgreOdeSpace.cpp (-1 / +1 lines)
62	//------------------------------------------------------------------------------------------------	62	//------------------------------------------------------------------------------------------------
63	Geometry* Space::getGeometry(int index)	63	Geometry* Space::getGeometry(int index)
64	{	64	{
65	return (Geometry*) _world->getGeometryList().findItem((unsigned int)dSpaceGetGeom(_space,index));	65	return (Geometry*) _world->getGeometryList().findItem((unsigned long)dSpaceGetGeom(_space,index));
66	}	66	}
67	//------------------------------------------------------------------------------------------------	67	//------------------------------------------------------------------------------------------------
68	void Space::registerSpace()	68	void Space::registerSpace()

Return to bug 217299

Lines 211-217 Link Here

(-)src.old/OgreOdeGeometry.cpp (-3 / +3 lines)
211	{	211	{
212	_debug_contacts = new DebugContact*[_max_contacts];	212	_debug_contacts = new DebugContact*[_max_contacts];
213	for (unsigned int i = 0; i < _max_contacts; i++)	213	for (unsigned int i = 0; i < _max_contacts; i++)
214	_debug_contacts[i] = new DebugContact(Ogre::StringConverter::toString((int)_geom) +	214	_debug_contacts[i] = new DebugContact(Ogre::StringConverter::toString((long)_geom) +
215	"_Contact_" +	215	"_Contact_" +
216	Ogre::StringConverter::toString(i),	216	Ogre::StringConverter::toString(i),
217	_world);	217	_world);
Lines 273-279 Link Here
273	//------------------------------------------------------------------------------------------------	273	//------------------------------------------------------------------------------------------------
274	Space* Geometry::getSpace()	274	Space* Geometry::getSpace()
275	{	275	{
276	return (Space*)_world->getSpaceList().findItem((unsigned int)dGeomGetSpace(_geom));	276	return (Space*)_world->getSpaceList().findItem((unsigned long)dGeomGetSpace(_geom));
277	}	277	}
278		278
279		279
Lines 425-431 Link Here
425	}	425	}
426	_debug_contacts = new DebugContact*[max_contacts];	426	_debug_contacts = new DebugContact*[max_contacts];
427	for (unsigned int i = 0; i < max_contacts; i++)	427	for (unsigned int i = 0; i < max_contacts; i++)
428	_debug_contacts[i] = new DebugContact(Ogre::StringConverter::toString((int)_geom) + + "_Contact_" + Ogre::StringConverter::toString(i),	428	_debug_contacts[i] = new DebugContact(Ogre::StringConverter::toString((long)_geom) + + "_Contact_" + Ogre::StringConverter::toString(i),
429	_world);	429	_world);
430	}	430	}
431	_max_contacts = max_contacts;	431	_max_contacts = max_contacts;