mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-27 22:57:45 +00:00
Code Activity

Some cleanup and buildfix

Browse source
This commit is contained in:
Mordred 2018-06-02 13:38:00 +02:00
parent 5c235601ee
commit d34598d295
8 changed files with 147 additions and 166 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/common/Network/PacketDef/Ipcs.h
View file

@ -1,7 +1,7 @@
#ifndef _CORE_NETWORK_PACKETS_IPCS_H
#define _CORE_NETWORK_PACKETS_IPCS_H
#include<stdint.h>
#include <stdint.h>
namespace Core {
namespace Network {
@ -175,8 +175,6 @@ namespace Packets {
};
// TODO: Include structures for the individual packet segment types
/**
* Client IPC Zone Type Codes.
*/

280
src/common/Network/PacketDef/Zone/ServerZoneDef.h
View file

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

6
src/servers/sapphire_zone/Event/EventDefs.h
View file

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

4
src/servers/sapphire_zone/Inventory/Inventory.cpp
View file

@ -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"

2
src/servers/sapphire_zone/Network/GameConnection.cpp
View file

@ -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>

2
src/servers/sapphire_zone/Network/GameConnection.h
View file

@ -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>

7
src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp
View file

@ -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"

8
src/servers/sapphire_zone/ServerZone.cpp
View file

@ -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"
@ -206,7 +202,7 @@ void Core::ServerZone::run( int32_t argc, char* argv[] )
void Core::ServerZone::printBanner() const
{
auto pLog = g_fw.get< Core::Logger>();
auto pLog = g_fw.get< Core::Logger >();
pLog->info("===========================================================" );
pLog->info( "Sapphire Server Project " );