From 16765acecab47480d982703e0b81e5d0ea678348 Mon Sep 17 00:00:00 2001 From: Vincent Gee Date: Sun, 30 Nov 2014 19:06:27 -0500 Subject: [PATCH] Bit Alignment of variables in serverQuery.cpp --- Engine/source/app/net/serverQuery.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Engine/source/app/net/serverQuery.cpp b/Engine/source/app/net/serverQuery.cpp index 4cf0df1eb..f0cace57e 100644 --- a/Engine/source/app/net/serverQuery.cpp +++ b/Engine/source/app/net/serverQuery.cpp @@ -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() { @@ -437,7 +437,7 @@ ConsoleFunction( queryAllServers, void, 12, 12, "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); @@ -464,7 +464,7 @@ ConsoleFunction( queryLanServers, void, 12, 12, "queryLanServers(...);" ) clearServerList(); queryLanServers(lanPort, flags, gameType, missionType, minPlayers, maxPlayers, maxBots, - regionMask, maxPing, minCPU, filterFlags); + regionMask, maxPing, minCPU, filterFlags); dFree(gameType); dFree(missionType);