Some cleanup and buildfix

src/common/Network/PacketDef/Ipcs.h

@@ -175,8 +175,6 @@ namespace Packets {
 
    };
 
-   // TODO: Include structures for the individual packet segment types
-
    /**
    * Client IPC Zone Type Codes.
    */

src/common/Network/PacketDef/Zone/ServerZoneDef.h

@@ -611,147 +611,147 @@ struct FFXIVIpcInitUI : FFXIVIpcBasePacket<InitUI>
 {
    // plain C types for a bit until the packet is actually fixed.
    // makes conversion between different editors easier.
-   __int64 contentId;
+   uint64_t contentId;
-   unsigned int unknown8;
+   uint32_t unknown8;
-   unsigned int unknownC;
+   uint32_t unknownC;
-   unsigned int charId;
+   uint32_t charId;
-   unsigned int restedExp;
+   uint32_t restedExp;
-   unsigned int companionCurrentExp;
+   uint32_t companionCurrentExp;
-   unsigned int unknown3C;
+   uint32_t unknown3C;
-   unsigned int fishCaught;
+   uint32_t fishCaught;
-   unsigned int useBaitCatalogId;
+   uint32_t useBaitCatalogId;
-   unsigned int pvpWolfFoldMatches;
+   uint32_t pvpWolfFoldMatches;
-   unsigned __int16 pvpWolfFoldWeeklyMatches;
+   uint16_t pvpWolfFoldWeeklyMatches;
-   unsigned __int16 pvpWolfFoldWeeklyVictories;
+   uint16_t pvpWolfFoldWeeklyVictories;
-   unsigned __int16 pvpStats[6];
+   uint16_t pvpStats[6];
-   unsigned __int16 playerCommendations;
+   uint16_t playerCommendations;
-   unsigned __int16 pvpStats1;
+   uint16_t pvpStats1;
-   unsigned __int8 frontlineCampaigns[4];
+   uint16_t frontlineCampaigns[4];
-   unsigned __int16 frontlineCampaignsWeekly;
+   uint16_t frontlineCampaignsWeekly;
-   unsigned __int8 currentRelic;
+   uint16_t currentRelic;
-   unsigned __int8 currentBook;
+   uint16_t currentBook;
-   unsigned __int8 masterCrafterMask;
+   uint16_t masterCrafterMask;
-   unsigned __int8 unknown69;
+   uint16_t unknown69;
-   unsigned __int8 unknown6A;
+   uint16_t unknown6A;
-   unsigned __int8 unknown6B;
+   uint16_t unknown6B;
-   unsigned __int8 unknown6C[4];
+   uint16_t unknown6C[4];
-   unsigned __int8 unknown50[34];
+   uint16_t unknown50[34];
-   unsigned __int16 unknown18;
+   uint16_t unknown18;
-   unsigned __int8 maxLevel;
+   uint16_t maxLevel;
-   unsigned __int8 expansion;
+   uint16_t expansion;
-   unsigned __int8 unknown76;
+   uint16_t unknown76;
-   unsigned __int8 race;
+   uint16_t race;
-   unsigned __int8 tribe;
+   uint16_t tribe;
-   unsigned __int8 gender;
+   uint16_t gender;
-   unsigned __int8 currentJob;
+   uint16_t currentJob;
-   unsigned __int8 currentClass;
+   uint16_t currentClass;
-   unsigned __int8 deity;
+   uint16_t deity;
-   unsigned __int8 namedayMonth;
+   uint16_t namedayMonth;
-   unsigned __int8 namedayDay;
+   uint16_t namedayDay;
-   unsigned __int8 cityState;
+   uint16_t cityState;
-   unsigned __int8 homepoint;
+   uint16_t homepoint;
-   unsigned __int8 unknown26;
+   uint16_t unknown26;
-   unsigned __int8 petHotBar;
+   uint16_t petHotBar;
-   unsigned __int8 companionRank;
+   uint16_t companionRank;
-   unsigned __int8 companionStars;
+   uint16_t companionStars;
-   unsigned __int8 companionSp;
+   uint16_t companionSp;
-   unsigned __int8 companionUnk2B;
+   uint16_t companionUnk2B;
-   unsigned __int8 companionColor;
+   uint16_t companionColor;
-   unsigned __int8 companionFavoFeed;
+   uint16_t companionFavoFeed;
-   unsigned __int8 companionUnk89;
+   uint16_t companionUnk89;
-   unsigned __int8 companionUnk90[5];
+   uint16_t companionUnk90[5];
-   unsigned __int16 unknown90[7];
+   uint16_t unknown90[7];
-   unsigned __int16 unknown9E;
+   uint16_t unknown9E;
-   unsigned __int16 unknownA0;
+   uint16_t unknownA0;
-   unsigned int exp[25];
+   uint32_t exp[25];
-   unsigned __int8 unknown564[16];
+   uint16_t unknown564[16];
-   unsigned int pvpFrontlineOverall1st;
+   uint32_t pvpFrontlineOverall1st;
-   unsigned int pvpFrontlineOverall2nd;
+   uint32_t pvpFrontlineOverall2nd;
-   unsigned int pvpFrontlineOverall3rd;
+   uint32_t pvpFrontlineOverall3rd;
-   unsigned __int8 relicBookCompletion1[4];
+   uint16_t relicBookCompletion1[4];
-   unsigned __int16 levels[25];
+   uint16_t levels[25];
-   unsigned __int16 levelsPadding;
+   uint16_t levelsPadding;
-   unsigned __int16 unknown15C[8];
+   uint16_t unknown15C[8];
-   unsigned __int16 fishingRecordsFish[26];
+   uint16_t fishingRecordsFish[26];
-   unsigned __int16 fishingRecordsFishWeight[26];
+   uint16_t fishingRecordsFishWeight[26];
-   unsigned __int8 unknownMask554[44];
+   uint16_t unknownMask554[44];
-   unsigned __int8 companion_name[21];
+   uint16_t companion_name[21];
-   unsigned __int8 companionDefRank;
+   uint16_t companionDefRank;
-   unsigned __int8 companionAttRank;
+   uint16_t companionAttRank;
-   unsigned __int8 companionHealRank;
+   uint16_t companionHealRank;
-   unsigned __int8 mountGuideMask[16];
+   uint16_t mountGuideMask[16];
    char name[32];
-   unsigned __int8 unknownOword[16];
+   uint16_t unknownOword[16];
-   unsigned __int8 unknown258;
+   uint16_t unknown258;
-   unsigned __int8 unlockBitmask[64];
+   uint16_t unlockBitmask[64];
-   unsigned __int8 aetheryte[17];
+   uint16_t aetheryte[17];
-   unsigned __int8 discovery[421];
+   uint16_t discovery[421];
-   unsigned __int8 howto[33];
+   uint16_t howto[33];
-   unsigned __int8 minions[38];
+   uint16_t minions[38];
-   unsigned __int8 chocoboTaxiMask[8];
+   uint16_t chocoboTaxiMask[8];
-   unsigned __int8 contentClearMask[111];
+   uint16_t contentClearMask[111];
-   unsigned __int8 contentClearPadding;
+   uint16_t contentClearPadding;
-   unsigned __int16 unknown428[8];
+   uint16_t unknown428[8];
-   unsigned __int8 companionBardingMask[8];
+   uint16_t companionBardingMask[8];
-   unsigned __int8 companionEquippedHead;
+   uint16_t companionEquippedHead;
-   unsigned __int8 companionEquippedBody;
+   uint16_t companionEquippedBody;
-   unsigned __int8 companionEquippedFeet;
+   uint16_t companionEquippedFeet;
-   unsigned __int8 companionUnk4[4];
+   uint16_t companionUnk4[4];
-   unsigned __int8 companion_fields[11];
+   uint16_t companion_fields[11];
-   unsigned __int8 fishingGuideMask[89];
+   uint16_t fishingGuideMask[89];
-   unsigned __int8 fishingSpotVisited[25];
+   uint16_t fishingSpotVisited[25];
-   unsigned __int8 unknownMask4Padding;
+   uint16_t unknownMask4Padding;
-   unsigned __int8 rankAmalJaa;
+   uint16_t rankAmalJaa;
-   unsigned __int8 rankSylph;
+   uint16_t rankSylph;
-   unsigned __int8 rankKobold;
+   uint16_t rankKobold;
-   unsigned __int8 rankSahagin;
+   uint16_t rankSahagin;
-   unsigned __int8 rankIxal;
+   uint16_t rankIxal;
-   unsigned __int8 rankVanu;
+   uint16_t rankVanu;
-   unsigned __int8 rankVath;
+   uint16_t rankVath;
-   unsigned __int8 rankMoogle;
+   uint16_t rankMoogle;
-   unsigned __int8 rankKojin;
+   uint16_t rankKojin;
-   unsigned __int8 rankAnata;
+   uint16_t rankAnata;
-   unsigned __int16 expAmalJaa;
+   uint16_t expAmalJaa;
-   unsigned __int16 expSylph;
+   uint16_t expSylph;
-   unsigned __int16 expKobold;
+   uint16_t expKobold;
-   unsigned __int16 expSahagin;
+   uint16_t expSahagin;
-   unsigned __int16 expIxal;
+   uint16_t expIxal;
-   unsigned __int16 expVanu;
+   uint16_t expVanu;
-   unsigned __int16 expVath;
+   uint16_t expVath;
-   unsigned __int16 expMoogle;
+   uint16_t expMoogle;
-   unsigned __int16 expKojin;
+   uint16_t expKojin;
-   unsigned __int16 expAnata;
+   uint16_t expAnata;
-   unsigned __int8 unknown596[10];
+   uint16_t unknown596[10];
-   unsigned __int16 unknown5A0[5];
+   uint16_t unknown5A0[5];
-   unsigned __int8 unknownMask59E[5];
+   uint16_t unknownMask59E[5];
-   unsigned __int8 unknown5A3[18];
+   uint16_t unknown5A3[18];
-   unsigned __int8 unknownMask5C1[28];
+   uint16_t unknownMask5C1[28];
-   unsigned __int8 unknown_03411;
+   uint16_t unknown_03411;
-   unsigned int unknownDword5E0;
+   uint32_t unknownDword5E0;
-   unsigned __int16 pvpFrontlineWeekly1st;
+   uint16_t pvpFrontlineWeekly1st;
-   unsigned __int16 pvpFrontlineWeekly2nd;
+   uint16_t pvpFrontlineWeekly2nd;
-   unsigned __int16 pvpFrontlineWeekly3rd;
+   uint16_t pvpFrontlineWeekly3rd;
-   unsigned __int8 relicBookCompletion2[8];
+   uint16_t relicBookCompletion2[8];
-   unsigned __int8 sightseeingMask[26];
+   uint16_t sightseeingMask[26];
-   unsigned __int16 unknown_XXX;
+   uint16_t unknown_XXX;
-   unsigned __int8 unknown61E[20];
+   uint16_t unknown61E[20];
-   unsigned __int8 unknown656[29];
+   uint16_t unknown656[29];
-   unsigned __int8 unknown63F[22];
+   uint16_t unknown63F[22];
-   unsigned __int8 tripleTriadCards[28];
+   uint16_t tripleTriadCards[28];
-   unsigned __int8 unknown671[11];
+   uint16_t unknown671[11];
-   unsigned __int8 unknownMask67C[22];
+   uint16_t unknownMask67C[22];
-   unsigned __int8 unknown692[3];
+   uint16_t unknown692[3];
-   unsigned __int8 orchestrionMask[40];
+   uint16_t orchestrionMask[40];
-   unsigned __int8 hallOfNoviceCompleteMask[3];
+   uint16_t hallOfNoviceCompleteMask[3];
-   unsigned __int8 unknownMask6C0[11];
+   uint16_t unknownMask6C0[11];
-   unsigned __int8 unknownMask6CB[16];
+   uint16_t unknownMask6CB[16];
-   unsigned __int8 unknown6DB[14];
+   uint16_t unknown6DB[14];
-   unsigned __int8 unlockedRaids[28];
+   uint16_t unlockedRaids[28];
-   unsigned __int8 unlockedDungeons[18];
+   uint16_t unlockedDungeons[18];
-   unsigned __int8 unlockedGuildhests[10];
+   uint16_t unlockedGuildhests[10];
-   unsigned __int8 unlockedTrials[7];
+   uint16_t unlockedTrials[7];
-   unsigned __int8 unlockedPvp[5];
+   uint16_t unlockedPvp[5];
-   unsigned __int8 unknownMask72D[28];
+   uint16_t unknownMask72D[28];
 
 };
 

src/servers/sapphire_zone/Event/EventDefs.h

@@ -69,12 +69,6 @@ namespace Core
       EVENT_TABLE_GAME = 24
    };
 
-   enum EventFinishState
-   {
-      UNLOCK = 1,
-      KEEPLOCK = 0
-   };
-
    enum DamageType
    {
       STD_DAMAGE = 0X03,

src/servers/sapphire_zone/Inventory/Inventory.cpp

@@ -2,7 +2,7 @@
 #include <boost/algorithm/clamp.hpp>
 
 #include <Network/PacketDef/Zone/ServerZoneDef.h>
-#include <Common.h>
+
 #include <Exd/ExdDataGenerated.h>
 #include <Logging/Logger.h>
 #include <Database/DatabaseDef.h>
@@ -12,8 +12,6 @@
 #include "Network/PacketWrappers/ServerNoticePacket.h"
 #include "Network/PacketWrappers/ActorControlPacket143.h"
 
-#include "Forwards.h"
-#include "Inventory.h"
 #include "ItemContainer.h"
 #include "Item.h"
 #include "Framework.h"

src/servers/sapphire_zone/Network/GameConnection.cpp

@@ -4,6 +4,8 @@
 #include <Network/CommonNetwork.h>
 #include <Util/Util.h>
 #include <Logging/Logger.h>
+
+#include <Network/Acceptor.h>
 #include <Network/PacketContainer.h>
 #include <Network/GamePacketParser.h>
 

src/servers/sapphire_zone/Network/GameConnection.h

@@ -2,7 +2,7 @@
 #define GAMECONNECTION_H
 
 #include <Network/Connection.h>
-#include <Network/Acceptor.h>
+
 #include <Network/CommonNetwork.h>
 #include <Network/GamePacket.h>
 #include <Util/LockedQueue.h>

src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp

@@ -7,7 +7,6 @@
 #include <Network/PacketContainer.h>
 
 #include <unordered_map>
-#include <boost/format.hpp>
 
 #include "Network/GameConnection.h"
 
@@ -18,7 +17,6 @@
 #include "Zone/InstanceContent.h"
 #include "Zone/ZonePosition.h"
 
-#include "Network/GameConnection.h"
 #include "Network/PacketWrappers/InitUIPacket.h"
 #include "Network/PacketWrappers/PingPacket.h"
 #include "Network/PacketWrappers/MoveActorPacket.h"
@@ -33,16 +31,11 @@
 
 #include "DebugCommand/DebugCommandHandler.h"
 
-#include "Actor/Player.h"
-
-#include "Inventory/Inventory.h"
-
 #include "Event/EventHelper.h"
 
 #include "Action/Action.h"
 #include "Action/ActionTeleport.h"
 
-#include "Session.h"
 #include "ServerZone.h"
 #include "Forwards.h"
 #include "Framework.h"

src/servers/sapphire_zone/ServerZone.cpp

@@ -3,7 +3,6 @@
 #include <Version.h>
 #include <Logging/Logger.h>
 #include <Config/XMLConfig.h>
-#include <Version.h>
 
 #include <MySqlBase.h>
 #include <Connection.h>
@@ -26,15 +25,12 @@
 
 #include "Zone/TerritoryMgr.h"
 
-#include "DebugCommand/DebugCommandHandler.h"
-
 #include "Script/ScriptMgr.h"
 #include "Linkshell/LinkshellMgr.h"
 
 #include "Forwards.h"
-#include <boost/foreach.hpp>
+
 #include <boost/make_shared.hpp>
-#include <boost/algorithm/string.hpp>
 #include <thread>
 
 #include "Framework.h"