TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-27 18:43: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

8
Engine/source/terrain/terrData.cpp
View file

@ -1303,20 +1303,20 @@ DefineEngineMethod( TerrainBlock, save, bool, ( const char* fileName),,
"@return True if file save was successful, false otherwise")
{
char filename[256];
dStrcpy(filename,fileName);
dStrcpy(filename,fileName,256);
char *ext = dStrrchr(filename, '.');
if (!ext || dStricmp(ext, ".ter") != 0)
dStrcat(filename, ".ter");
dStrcat(filename, ".ter", 256);
return static_cast<TerrainBlock*>(object)->save(filename);
}
//ConsoleMethod(TerrainBlock, save, bool, 3, 3, "(string fileName) - saves the terrain block's terrain file to the specified file name.")
//{
// char filename[256];
// dStrcpy(filename,argv[2]);
// dStrcpy(filename,argv[2],256);
// char *ext = dStrrchr(filename, '.');
// if (!ext || dStricmp(ext, ".ter") != 0)
// dStrcat(filename, ".ter");
// dStrcat(filename, ".ter", 256);
// return static_cast<TerrainBlock*>(object)->save(filename);
//}