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 remote-tracking branch 'jamesu/console_stack_fix2' into development

Browse source 
Conflicts:
	Engine/source/console/console.cpp
This commit is contained in:
Daniel Buckmaster 2015-03-01 20:33:29 +11:00
commit 6c92ab065e
48 changed files with 2979 additions and 449 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/app/net/serverQuery.cpp
View file

@ -1337,7 +1337,7 @@ static void processPingsAndQueries( U32 session, bool schedule )
else
dSprintf( msg, sizeof( msg ), "%d servers found.", foundCount );
Con::executef( "onServerQueryStatus", "done", msg, "1");
Con::executef( "onServerQueryStatus", "done", (const char*)msg, "1");
}
}