TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-13 15:44:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Amend console stack fixes to work with gcc in Ubuntu x64.

Browse source
This commit is contained in:
Daniel Buckmaster 2015-03-01 20:34:16 +11:00
parent 6c92ab065e
commit 57eed9c8e4
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Engine/source/console/console.cpp
View file

@ -1758,7 +1758,7 @@ const char *ConsoleValue::getStringValue()
if(type == TypeInternalString || type == TypeInternalStackString) if(type == TypeInternalString || type == TypeInternalStackString)
return sval; return sval;
else if (type == TypeInternalStringStackPtr) else if (type == TypeInternalStringStackPtr)
return STR.mBuffer + (U32)sval; return STR.mBuffer + (uintptr_t)sval;
if(type == TypeInternalFloat) if(type == TypeInternalFloat)
return Con::getData(TypeF32, &fval, 0); return Con::getData(TypeF32, &fval, 0);
else if(type == TypeInternalInt) else if(type == TypeInternalInt)
@ -1770,9 +1770,9 @@ const char *ConsoleValue::getStringValue()
StringStackPtr ConsoleValue::getStringStackPtr() StringStackPtr ConsoleValue::getStringStackPtr()
{ {
if (type == TypeInternalStringStackPtr) if (type == TypeInternalStringStackPtr)
return (U32)sval; return (uintptr_t)sval;
else else
return (U32)-1; return (uintptr_t)-1;
} }
bool ConsoleValue::getBoolValue() bool ConsoleValue::getBoolValue()

2
Engine/source/console/simEvents.cpp
View file

@ -129,7 +129,7 @@ ConsoleValueRef SimConsoleThreadExecCallback::waitForResult()
return retVal; return retVal;
} }
return NULL; return (const char*)NULL;
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------