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

Bit  Alignment of variables in serverQuery.cpp
This commit is contained in:
Daniel Buckmaster 2014-12-12 21:47:40 +11:00
commit 4210c002bb

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()
{ {