TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-14 08:04:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #991 from Winterleaf/BitAlign-ServerQuery.cpp

Browse source 
Bit  Alignment of variables in serverQuery.cpp
This commit is contained in:
Daniel Buckmaster 2014-12-12 21:47:40 +11:00
commit 4210c002bb
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -207,10 +207,6 @@ struct ServerFilter
Favorites = 3, Favorites = 3,
}; };
Type type;
char* gameType;
char* missionType;
enum // Query Flags enum // Query Flags
{ {
OnlineQuery = 0, // Authenticated with master OnlineQuery = 0, // Authenticated with master
@ -227,16 +223,20 @@ struct ServerFilter
NotXenon = BIT(6) NotXenon = BIT(6)
}; };
//Rearranging the fields according to their sizes
char* gameType;
char* missionType;
U8 queryFlags; U8 queryFlags;
U8 minPlayers; U8 minPlayers;
U8 maxPlayers; U8 maxPlayers;
U8 maxBots; U8 maxBots;
U8 filterFlags;
U8 buddyCount;
U16 minCPU;
U32 regionMask; U32 regionMask;
U32 maxPing; U32 maxPing;
U8 filterFlags;
U16 minCPU;
U8 buddyCount;
U32* buddyList; U32* buddyList;
Type type;
ServerFilter() ServerFilter()
{ {
@ -437,7 +437,7 @@ ConsoleFunction( queryAllServers, void, 12, 12, "queryAllServers(...);" )
maxBots,regionMask,maxPing,minCPU,filterFlags,0,&buddyList); maxBots,regionMask,maxPing,minCPU,filterFlags,0,&buddyList);
queryLanServers(lanPort, flags, gameType, missionType, minPlayers, maxPlayers, maxBots, queryLanServers(lanPort, flags, gameType, missionType, minPlayers, maxPlayers, maxBots,
regionMask, maxPing, minCPU, filterFlags); regionMask, maxPing, minCPU, filterFlags);
dFree(gameType); dFree(gameType);
dFree(missionType); dFree(missionType);
@ -464,7 +464,7 @@ ConsoleFunction( queryLanServers, void, 12, 12, "queryLanServers(...);" )
clearServerList(); clearServerList();
queryLanServers(lanPort, flags, gameType, missionType, minPlayers, maxPlayers, maxBots, queryLanServers(lanPort, flags, gameType, missionType, minPlayers, maxPlayers, maxBots,
regionMask, maxPing, minCPU, filterFlags); regionMask, maxPing, minCPU, filterFlags);
dFree(gameType); dFree(gameType);
dFree(missionType); dFree(missionType);