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' into defineconsolemethod

Browse source 
Conflicts:
	Engine/source/materials/materialDefinition.cpp
This commit is contained in:
Daniel Buckmaster 2014-12-26 13:22:16 +11:00
commit ae284a89ec
129 changed files with 3742 additions and 1038 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -207,10 +207,6 @@ struct ServerFilter
Favorites = 3,
};
Type type;
char* gameType;
char* missionType;
enum // Query Flags
{
OnlineQuery = 0, // Authenticated with master
@ -226,17 +222,21 @@ struct ServerFilter
CurrentVersion = BIT(7),
NotXenon = BIT(6)
};
//Rearranging the fields according to their sizes
char* gameType;
char* missionType;
U8 queryFlags;
U8 minPlayers;
U8 maxPlayers;
U8 maxBots;
U8 filterFlags;
U8 buddyCount;
U16 minCPU;
U32 regionMask;
U32 maxPing;
U8 filterFlags;
U16 minCPU;
U8 buddyCount;
U32* buddyList;
Type type;
ServerFilter()
{
@ -432,7 +432,7 @@ DefineConsoleFunction( queryAllServers
maxBots,regionMask,maxPing,minCPU,filterFlags,0,&buddyList);
queryLanServers(lanPort, flags, gameType, missionType, minPlayers, maxPlayers, maxBots,
regionMask, maxPing, minCPU, filterFlags);
regionMask, maxPing, minCPU, filterFlags);
dFree(gameType);
dFree(missionType);
@ -456,7 +456,7 @@ DefineConsoleFunction( queryLanServers
clearServerList();
queryLanServers(lanPort, flags, gameType, missionType, minPlayers, maxPlayers, maxBots,
regionMask, maxPing, minCPU, filterFlags);
regionMask, maxPing, minCPU, filterFlags);
}