TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-26 15:49:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Linux implementation. Include changes for gcc x64.

Browse source
This commit is contained in:
LuisAntonRebollo 2015-01-24 22:08:26 +01:00
parent 4e52824a42
commit 4e9034854d
56 changed files with 1108 additions and 3075 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Engine/source/forest/editor/forestUndo.cpp
View file

@ -68,7 +68,7 @@ void ForestCreateUndoAction::redo()
// We store the datablock ID rather than the actual pointer
// since the pointer could go bad.
ForestItemData *data;
if ( !Sim::findObject( (SimObjectId)(item.getData()), data ) )
if ( !Sim::findObject( (SimObjectId)(uintptr_t)(item.getData()), data ) )
{
Con::errorf( "ForestCreateUndoAction::redo() - ForestItemData for item to restore does not seem to exist. Undo stack may be hosed." );
continue;
@ -140,7 +140,7 @@ void ForestDeleteUndoAction::undo()
// We store the datablock ID rather than the actual pointer
// since the pointer could go bad.
ForestItemData *data;
if ( !Sim::findObject( (SimObjectId)(item.getData()), data ) )
if ( !Sim::findObject( (SimObjectId)(uintptr_t)(item.getData()), data ) )
{
Con::errorf( "ForestDeleteUndoAction::undo() - ForestItemData for item to restore does not seem to exist. Undo stack may be hosed." );
continue;
@ -201,7 +201,7 @@ void ForestUpdateAction::_swapState()
// We store the datablock ID rather than the actual pointer
// since the pointer could go bad.
ForestItemData *data;
if ( !Sim::findObject( (SimObjectId)(item.getData()), data ) )
if ( !Sim::findObject( (SimObjectId)(uintptr_t)(item.getData()), data ) )
{
Con::errorf( "ForestUpdateAction::_swapState() - ForestItemData for item to restore does not seem to exist. Undo stack may be hosed." );
continue;