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

4
Engine/source/console/simDatablock.cpp
View file

@ -198,10 +198,10 @@ void SimDataBlock::performSubstitutions(SimDataBlock* dblock, const SimObject* o
}
char obj_str[32];
dStrcpy(obj_str, Con::getIntArg(obj->getId()));
dStrcpy(obj_str, Con::getIntArg(obj->getId()), 32);
char index_str[32];
dStrcpy(index_str, Con::getIntArg(index));
dStrcpy(index_str, Con::getIntArg(index), 32);
for (S32 i = 0; i < substitutions.size(); i++)
{