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

5
Engine/source/util/messaging/eventManager.cpp
View file

@ -288,8 +288,9 @@ bool EventManager::subscribe(SimObject *callbackObj, const char* event, const ch
}
else
{
cb = new char[dStrlen(callback) + 1];
dStrcpy(cb, callback);
dsize_t cbLen = dStrlen(callback) + 1;
cb = new char[cbLen];
dStrcpy(cb, callback, cbLen);
}
// Create the subscriber object.

10
Engine/source/util/undo.cpp
View file

@ -545,8 +545,9 @@ DefineConsoleMethod(UndoManager, getNextUndoName, const char *, (),, "UndoManage
const char *name = object->getNextUndoName();
if(!name)
return NULL;
char *ret = Con::getReturnBuffer(dStrlen(name) + 1);
dStrcpy(ret, name);
dsize_t retLen = dStrlen(name) + 1;
char *ret = Con::getReturnBuffer(retLen);
dStrcpy(ret, name, retLen);
return ret;
}
@ -556,8 +557,9 @@ DefineConsoleMethod(UndoManager, getNextRedoName, const char *, (),, "UndoManage
const char *name = object->getNextRedoName();
if(!name)
return NULL;
char *ret = Con::getReturnBuffer(dStrlen(name) + 1);
dStrcpy(ret, name);
dsize_t retLen = dStrlen(name) + 1;
char *ret = Con::getReturnBuffer(retLen);
dStrcpy(ret, name, retLen);
return ret;
}