TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-12 19:31:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

18
Engine/source/sim/actionMap.cpp
View file

@ -1746,7 +1746,8 @@ static ConsoleDocFragment _ActionMapbind2(
ConsoleMethod( ActionMap, bind, bool, 5, 10, "actionMap.bind( device, action, [modifier spec, mod...], command )"
"@hide")
{
return object->processBind( argc - 2, argv + 2, NULL );
StringStackWrapper args(argc - 2, argv + 2);
return object->processBind( args.count(), args, NULL );
}
static ConsoleDocFragment _ActionMapbindObj1(
@ -1794,14 +1795,15 @@ static ConsoleDocFragment _ActionMapbindObj2(
ConsoleMethod( ActionMap, bindObj, bool, 6, 11, "(device, action, [modifier spec, mod...], command, object)"
"@hide")
{
SimObject* simObject = Sim::findObject(argv[argc - 1]);
if ( simObject == NULL )
{
Con::warnf("ActionMap::bindObj() - Cannot bind, specified object was not found!");
return false;
}
SimObject* simObject = Sim::findObject(argv[argc - 1]);
if ( simObject == NULL )
{
Con::warnf("ActionMap::bindObj() - Cannot bind, specified object was not found!");
return false;
}
return object->processBind( argc - 3, argv + 2, simObject );
StringStackWrapper args(argc - 3, argv + 2);
return object->processBind( args.count(), args, simObject );
}
//------------------------------------------------------------------------------

3
Engine/source/sim/netConnection.cpp
View file

@ -433,6 +433,9 @@ NetConnection::NetConnection()
// Disable starting a new journal recording or playback from here on
Journal::Disable();
// Ensure NetAddress is cleared
dMemset(&mNetAddress, '\0', sizeof(NetAddress));
}
NetConnection::~NetConnection()