瀏覽代碼

Bit Alignment of variables in serverQuery.cpp

Vincent Gee 10 年之前
父節點
當前提交
16765aceca
共有 1 個文件被更改,包括 10 次插入10 次删除
  1. 10 10
      Engine/source/app/net/serverQuery.cpp

+ 10 - 10
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;
-   U32   regionMask;
-   U32   maxPing;
    U8    filterFlags;
-   U16   minCPU;
    U8    buddyCount;
+   U16   minCPU;
+   U32   regionMask;
+   U32   maxPing;
    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);