From c12648e495269da3db3a88a0039f080a25c22b68 Mon Sep 17 00:00:00 2001
From: Mordred <ffxivsapphire@gmail.com>
Date: Tue, 18 Sep 2018 23:23:18 +0200
Subject: [PATCH] Fixed initui

---
 src/common/Network/PacketDef/Ipcs.h           |  2 +-
 .../Network/PacketDef/Zone/ServerZoneDef.h    | 34 ++++++++-----------
 2 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index de799ab3..08ec79b4 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -275,7 +275,7 @@ enum ClientZoneIpcType :
   EnterTeriEventHandler = 0x014F, // updated 4.4
 
   ReturnEventHandler = 0x0154, // updated 4.4
-  TradeReturnEventHandler = 0x0155, // updated 4.4 
+  TradeReturnEventHandler = 0x0155, // updated 4.4
 
   LinkshellEventHandler = 0x0150, // updated 4.1 ??
   LinkshellEventHandler1 = 0x0151, // updated 4.1 ??
diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index 038c7b3f..3bbf5a1a 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -691,8 +691,7 @@ struct FFXIVIpcUpdateClassInfo :
  * Structural representation of the packet sent by the server
  * to send the titles available to the player
  */
-struct FFXIVIpcPlayerTitleList :
-  FFXIVIpcBasePacket< PlayerTitleList >
+struct FFXIVIpcPlayerTitleList : FFXIVIpcBasePacket< PlayerTitleList >
 {
   uint8_t titleList[48];
 };
@@ -701,8 +700,7 @@ struct FFXIVIpcPlayerTitleList :
 * Structural representation of the packet sent by the server
 * to initialize a zone for the player
 */
-struct FFXIVIpcInitZone :
-  FFXIVIpcBasePacket< InitZone >
+struct FFXIVIpcInitZone : FFXIVIpcBasePacket< InitZone >
 {
   uint16_t serverId;
   uint16_t zoneId;
@@ -727,8 +725,7 @@ struct FFXIVIpcInitZone :
 * Structural representation of the packet sent by the server to initialize
 * the client UI upon initial connection.
 */
-struct FFXIVIpcInitUI :
-  FFXIVIpcBasePacket< InitUI >
+struct FFXIVIpcInitUI : FFXIVIpcBasePacket< InitUI >
 {
   // plain C types for a bit until the packet is actually fixed.
   // makes conversion between different editors easier.
@@ -759,11 +756,11 @@ struct FFXIVIpcInitUI :
   unsigned short unknown5E;
   unsigned short pvpFrontlineWeeklyCampaigns;
   unsigned short enhancedAnimaGlassProgress;
-  unsigned short unknown64[4]; // needs confirmation, probably pvp total/weeklies
+  unsigned short unknown64[4];
   unsigned short pvpRivalWingsTotalMatches;
   unsigned short pvpRivalWingsTotalVictories;
-  unsigned short pvpRivalWingsWeeklyMatches; // needs confirmation
-  unsigned short pvpRivalWingsWeeklyVictories; // needs confirmation
+  unsigned short pvpRivalWingsWeeklyMatches;
+  unsigned short pvpRivalWingsWeeklyVictories;
   unsigned char maxLevel;
   unsigned char expansion;
   unsigned char unknown76;
@@ -813,7 +810,7 @@ struct FFXIVIpcInitUI :
   unsigned char companionDefRank;
   unsigned char companionAttRank;
   unsigned char companionHealRank;
-  unsigned char mountGuideMask[16];
+  unsigned char mountGuideMask[17];
   char name[32];
   unsigned char unknownOword[16];
   unsigned char unknown258;
@@ -821,9 +818,9 @@ struct FFXIVIpcInitUI :
   unsigned char aetheryte[17];
   unsigned char discovery[421];
   unsigned char howto[33];
-  unsigned char minions[38];
+  unsigned char minions[40];
   unsigned char chocoboTaxiMask[8];
-  unsigned char watchedCutscenes[111];
+  unsigned char watchedCutscenes[115];
   unsigned char companionBardingMask[9];
   unsigned char companionEquippedHead;
   unsigned char companionEquippedBody;
@@ -843,12 +840,12 @@ struct FFXIVIpcInitUI :
   unsigned char unknownMask5C4[3];
   unsigned char unknown5C9[2];
   unsigned char challengeLogComplete[9];
-  unsigned char unknown5D4[9];
+  unsigned char unknown5D4[11];
   unsigned char unknownMask5DD[28];
   unsigned char relicCompletion[12];
   unsigned char sightseeingMask[26];
   unsigned char huntingMarkMask[55];
-  unsigned char tripleTriadCards[29];
+  unsigned char tripleTriadCards[30];
   unsigned char unknownMask673[10];
   unsigned char unknown67D;
   unsigned char aetherCurrentMask[22];
@@ -856,18 +853,17 @@ struct FFXIVIpcInitUI :
   unsigned char orchestrionMask[40];
   unsigned char hallOfNoviceCompleteMask[3];
   unsigned char animaCompletion[11];
-  unsigned char unknown6CD[3];
-  unsigned char unknownMask6C0[11];
-  unsigned char unknownMask6DB[13];
+  unsigned char unknown6CD[16];
+  unsigned char unknownMask6DB[11];
   unsigned char unlockedRaids[28];
   unsigned char unlockedDungeons[18];
   unsigned char unlockedGuildhests[10];
-  unsigned char unlockedTrials[7];
+  unsigned char unlockedTrials[8];
   unsigned char unlockedPvp[5];
   unsigned char clearedRaids[28];
   unsigned char clearedDungeons[18];
   unsigned char clearedGuildhests[10];
-  unsigned char clearedTrials[7];
+  unsigned char clearedTrials[8];
   unsigned char clearedPvp[5];
 
 };