TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-13 03:33:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'development' of https://github.com/GarageGames/Torque3D into memberMess

Browse source 
# Conflicts:
#	Engine/source/console/consoleFunctions.cpp
This commit is contained in:
Azaezel 2018-03-28 15:42:34 -05:00
commit cbce2ee805
154 changed files with 2950 additions and 705 deletions
Download patch file Download diff file Expand all files Collapse all files

28
Engine/source/console/simObject.cpp
View file

@ -320,7 +320,7 @@ void SimObject::writeFields(Stream &stream, U32 tabStop)
U32 nBufferSize = dStrlen( val ) + 1;
FrameTemp<char> valCopy( nBufferSize );
dStrcpy( (char *)valCopy, val );
dStrcpy( (char *)valCopy, val, nBufferSize );
if (!writeField(f->pFieldname, valCopy))
continue;
@ -347,7 +347,7 @@ void SimObject::writeFields(Stream &stream, U32 tabStop)
}
expandEscape((char*)expandedBuffer + dStrlen(expandedBuffer), val);
dStrcat(expandedBuffer, "\";\r\n");
dStrcat(expandedBuffer, "\";\r\n", expandedBufferSize);
stream.writeTabs(tabStop);
stream.write(dStrlen(expandedBuffer),expandedBuffer);
@ -402,12 +402,12 @@ bool SimObject::save(const char *pcFileName, bool bOnlySelected, const char *pre
char docRoot[256];
char modRoot[256];
dStrcpy(docRoot, pcFileName);
dStrcpy(docRoot, pcFileName, 256);
char *p = dStrrchr(docRoot, '/');
if (p) *++p = '\0';
else docRoot[0] = '\0';
dStrcpy(modRoot, pcFileName);
dStrcpy(modRoot, pcFileName, 256);
p = dStrchr(modRoot, '/');
if (p) *++p = '\0';
else modRoot[0] = '\0';
@ -1028,8 +1028,8 @@ void SimObject::setDataField(StringTableEntry slotName, const char *array, const
else
{
char buf[256];
dStrcpy(buf, slotName);
dStrcat(buf, array);
dStrcpy(buf, slotName, 256);
dStrcat(buf, array, 256);
StringTableEntry permanentSlotName = StringTable->insert(buf);
mFieldDictionary->setFieldValue(permanentSlotName, value);
onDynamicModified( permanentSlotName, value );
@ -1069,8 +1069,8 @@ const char *SimObject::getDataField(StringTableEntry slotName, const char *array
else
{
static char buf[256];
dStrcpy(buf, slotName);
dStrcat(buf, array);
dStrcpy(buf, slotName, 256);
dStrcat(buf, array, 256);
if (const char* val = mFieldDictionary->getFieldValue(StringTable->insert(buf)))
return val;
}
@ -1310,8 +1310,8 @@ U32 SimObject::getDataFieldType( StringTableEntry slotName, const char* array )
else
{
static char buf[256];
dStrcpy( buf, slotName );
dStrcat( buf, array );
dStrcpy( buf, slotName, 256 );
dStrcat( buf, array, 256 );
return mFieldDictionary->getFieldType( StringTable->insert( buf ) );
}
@ -1333,8 +1333,8 @@ void SimObject::setDataFieldType(const U32 fieldTypeId, StringTableEntry slotNam
else
{
static char buf[256];
dStrcpy( buf, slotName );
dStrcat( buf, array );
dStrcpy( buf, slotName, 256 );
dStrcat( buf, array, 256 );
mFieldDictionary->setFieldType( StringTable->insert( buf ), fieldTypeId );
onDynamicModified( slotName, mFieldDictionary->getFieldValue(slotName) );
@ -1354,8 +1354,8 @@ void SimObject::setDataFieldType(const char *typeName, StringTableEntry slotName
else
{
static char buf[256];
dStrcpy( buf, slotName );
dStrcat( buf, array );
dStrcpy( buf, slotName, 256 );
dStrcat( buf, array, 256 );
StringTableEntry permanentSlotName = StringTable->insert(buf);
mFieldDictionary->setFieldType( permanentSlotName, typeName );