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

Add workaround for issue #1292

Browse source
This commit is contained in:
James Urquhart 2015-05-15 12:27:52 +01:00
parent b30b5d9076
commit 3a218217f4
1 changed files with 25 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1759,12 +1759,32 @@ const char *ConsoleValue::getStringValue()
return sval; return sval;
else if (type == TypeInternalStringStackPtr) else if (type == TypeInternalStringStackPtr)
return STR.mBuffer + (uintptr_t)sval; return STR.mBuffer + (uintptr_t)sval;
if(type == TypeInternalFloat)
return Con::getData(TypeF32, &fval, 0);
else if(type == TypeInternalInt)
return Con::getData(TypeS32, &ival, 0);
else else
return Con::getData(type, dataPtr, 0, enumTable); {
// We need a string representation, so lets create one
const char *internalValue = NULL;
if(type == TypeInternalFloat)
internalValue = Con::getData(TypeF32, &fval, 0);
else if(type == TypeInternalInt)
internalValue = Con::getData(TypeS32, &ival, 0);
else
internalValue = Con::getData(type, dataPtr, 0, enumTable);
if (!internalValue)
return "";
U32 stringLen = dStrlen(internalValue);
U32 newLen = ((stringLen + 1) + 15) & ~15; // pad upto next cache line
if(sval == typeValueEmpty || type == TypeInternalStackString || type == TypeInternalStringStackPtr)
sval = (char *) dMalloc(newLen);
else if(newLen > bufferLen)
sval = (char *) dRealloc(sval, newLen);
dStrcpy(sval, internalValue);
return sval;
}
} }
StringStackPtr ConsoleValue::getStringStackPtr() StringStackPtr ConsoleValue::getStringStackPtr()