Merge branch 'consolefuncrefactor' of https://github.com/jamesu/Torque3D into consolefuncrefactor

This commit is contained in:
DavidWyand-GG 2013-01-07 12:09:22 -05:00
commit 59aaaf1892
93 changed files with 1947 additions and 728 deletions

View file

@ -493,9 +493,9 @@ ConsoleMethod( FileObject, writeObject, void, 3, 4, "FileObject.writeObject(SimO
return;
}
char *objName = NULL;
const char *objName = NULL;
if( argc == 4 )
objName = (char*)argv[3];
objName = (const char*)argv[3];
object->writeObject( obj, (const U8*)objName );
}