mirror of
https://github.com/SapphireServer/Sapphire.git
synced 2025-04-26 14:37:44 +00:00
remove exddata from sapphire_zone
This commit is contained in:
parent
b74083c06c
commit
7528db3b83
11 changed files with 1 additions and 16 deletions
|
@ -1,5 +1,4 @@
|
||||||
#include <common/Util/Util.h>
|
#include <common/Util/Util.h>
|
||||||
#include <common/Exd/ExdData.h>
|
|
||||||
#include <common/Util/UtilMath.h>
|
#include <common/Util/UtilMath.h>
|
||||||
|
|
||||||
#include "ActionCollision.h"
|
#include "ActionCollision.h"
|
||||||
|
|
|
@ -3,7 +3,6 @@
|
||||||
#include <common/Common.h>
|
#include <common/Common.h>
|
||||||
#include <common/Util/Util.h>
|
#include <common/Util/Util.h>
|
||||||
#include <common/Util/UtilMath.h>
|
#include <common/Util/UtilMath.h>
|
||||||
#include <common/Exd/ExdData.h>
|
|
||||||
#include <common/Logging/Logger.h>
|
#include <common/Logging/Logger.h>
|
||||||
|
|
||||||
#include "Network/PacketWrappers/ActorControlPacket142.h"
|
#include "Network/PacketWrappers/ActorControlPacket142.h"
|
||||||
|
@ -17,7 +16,6 @@ using namespace Core::Network;
|
||||||
using namespace Core::Network::Packets;
|
using namespace Core::Network::Packets;
|
||||||
using namespace Core::Network::Packets::Server;
|
using namespace Core::Network::Packets::Server;
|
||||||
|
|
||||||
extern Core::Data::ExdData g_exdData;
|
|
||||||
extern Core::Logger g_log;
|
extern Core::Logger g_log;
|
||||||
extern Core::Scripting::ScriptManager g_scriptMgr;
|
extern Core::Scripting::ScriptManager g_scriptMgr;
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
#include <common/Util/Util.h>
|
#include <common/Util/Util.h>
|
||||||
#include <common/Util/UtilMath.h>
|
#include <common/Util/UtilMath.h>
|
||||||
#include <common/Network/PacketContainer.h>
|
#include <common/Network/PacketContainer.h>
|
||||||
#include <common/Exd/ExdData.h>
|
|
||||||
#include <common/Exd/ExdDataGenerated.h>
|
#include <common/Exd/ExdDataGenerated.h>
|
||||||
#include <common/Network/GamePacket.h>
|
#include <common/Network/GamePacket.h>
|
||||||
|
|
||||||
|
|
|
@ -5,7 +5,6 @@
|
||||||
#include <cmath>
|
#include <cmath>
|
||||||
|
|
||||||
#include <common/Logging/Logger.h>
|
#include <common/Logging/Logger.h>
|
||||||
#include <common/Exd/ExdData.h>
|
|
||||||
#include <common/Util/Util.h>
|
#include <common/Util/Util.h>
|
||||||
#include <common/Util/UtilMath.h>
|
#include <common/Util/UtilMath.h>
|
||||||
|
|
||||||
|
@ -21,7 +20,6 @@ using namespace Core::Network::Packets;
|
||||||
using namespace Core::Network::Packets::Server;
|
using namespace Core::Network::Packets::Server;
|
||||||
|
|
||||||
extern Core::Logger g_log;
|
extern Core::Logger g_log;
|
||||||
extern Core::Data::ExdData g_exdData;
|
|
||||||
|
|
||||||
uint32_t Core::Entity::EventNpc::m_nextID = 1249241694;
|
uint32_t Core::Entity::EventNpc::m_nextID = 1249241694;
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
#include <common/Common.h>
|
#include <common/Common.h>
|
||||||
#include <common/Exd/ExdData.h>
|
|
||||||
#include <common/Network/GamePacket.h>
|
#include <common/Network/GamePacket.h>
|
||||||
#include <common/Logging/Logger.h>
|
#include <common/Logging/Logger.h>
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,6 @@
|
||||||
#include <common/Network/CommonNetwork.h>
|
#include <common/Network/CommonNetwork.h>
|
||||||
#include <common/Network/GamePacketNew.h>
|
#include <common/Network/GamePacketNew.h>
|
||||||
#include <common/Logging/Logger.h>
|
#include <common/Logging/Logger.h>
|
||||||
#include <common/Exd/ExdData.h>
|
|
||||||
#include <common/Network/PacketContainer.h>
|
#include <common/Network/PacketContainer.h>
|
||||||
|
|
||||||
#include <boost/format.hpp>
|
#include <boost/format.hpp>
|
||||||
|
@ -38,7 +37,6 @@
|
||||||
extern Core::Logger g_log;
|
extern Core::Logger g_log;
|
||||||
extern Core::ServerZone g_serverZone;
|
extern Core::ServerZone g_serverZone;
|
||||||
extern Core::TerritoryMgr g_territoryMgr;
|
extern Core::TerritoryMgr g_territoryMgr;
|
||||||
extern Core::Data::ExdData g_exdData;
|
|
||||||
extern Core::DebugCommandHandler g_gameCommandMgr;
|
extern Core::DebugCommandHandler g_gameCommandMgr;
|
||||||
|
|
||||||
using namespace Core::Common;
|
using namespace Core::Common;
|
||||||
|
|
|
@ -2,7 +2,6 @@
|
||||||
#include <common/Network/CommonNetwork.h>
|
#include <common/Network/CommonNetwork.h>
|
||||||
#include <common/Network/GamePacketNew.h>
|
#include <common/Network/GamePacketNew.h>
|
||||||
#include <common/Logging/Logger.h>
|
#include <common/Logging/Logger.h>
|
||||||
#include <common/Exd/ExdData.h>
|
|
||||||
#include <common/Network/PacketContainer.h>
|
#include <common/Network/PacketContainer.h>
|
||||||
|
|
||||||
#include <boost/format.hpp>
|
#include <boost/format.hpp>
|
||||||
|
@ -26,7 +25,6 @@
|
||||||
|
|
||||||
extern Core::Logger g_log;
|
extern Core::Logger g_log;
|
||||||
extern Core::ServerZone g_serverZone;
|
extern Core::ServerZone g_serverZone;
|
||||||
extern Core::Data::ExdData g_exdData;
|
|
||||||
extern Core::DebugCommandHandler g_gameCommandMgr;
|
extern Core::DebugCommandHandler g_gameCommandMgr;
|
||||||
|
|
||||||
using namespace Core::Common;
|
using namespace Core::Common;
|
||||||
|
|
|
@ -2,7 +2,6 @@
|
||||||
#include <common/Network/CommonNetwork.h>
|
#include <common/Network/CommonNetwork.h>
|
||||||
#include <common/Network/GamePacketNew.h>
|
#include <common/Network/GamePacketNew.h>
|
||||||
#include <common/Logging/Logger.h>
|
#include <common/Logging/Logger.h>
|
||||||
#include <common/Exd/ExdData.h>
|
|
||||||
#include <common/Network/PacketContainer.h>
|
#include <common/Network/PacketContainer.h>
|
||||||
#include <common/Network/PacketDef/Chat/ServerChatDef.h>
|
#include <common/Network/PacketDef/Chat/ServerChatDef.h>
|
||||||
#include <common/Database/DatabaseDef.h>
|
#include <common/Database/DatabaseDef.h>
|
||||||
|
@ -41,7 +40,6 @@
|
||||||
extern Core::Logger g_log;
|
extern Core::Logger g_log;
|
||||||
extern Core::ServerZone g_serverZone;
|
extern Core::ServerZone g_serverZone;
|
||||||
extern Core::TerritoryMgr g_territoryMgr;
|
extern Core::TerritoryMgr g_territoryMgr;
|
||||||
extern Core::Data::ExdData g_exdData;
|
|
||||||
extern Core::DebugCommandHandler g_gameCommandMgr;
|
extern Core::DebugCommandHandler g_gameCommandMgr;
|
||||||
|
|
||||||
using namespace Core::Common;
|
using namespace Core::Common;
|
||||||
|
|
|
@ -2,7 +2,6 @@
|
||||||
#include <common/Util/Util.h>
|
#include <common/Util/Util.h>
|
||||||
#include <common/Network/PacketDef/Zone/ServerZoneDef.h>
|
#include <common/Network/PacketDef/Zone/ServerZoneDef.h>
|
||||||
#include <common/Logging/Logger.h>
|
#include <common/Logging/Logger.h>
|
||||||
#include <common/Exd/ExdData.h>
|
|
||||||
|
|
||||||
#include <boost/algorithm/string.hpp>
|
#include <boost/algorithm/string.hpp>
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
|
|
|
@ -11,7 +11,6 @@
|
||||||
#include "InstanceContent.h"
|
#include "InstanceContent.h"
|
||||||
|
|
||||||
extern Core::Logger g_log;
|
extern Core::Logger g_log;
|
||||||
extern Core::Data::ExdData g_exdData;
|
|
||||||
extern Core::Data::ExdDataGenerated g_exdDataGen;
|
extern Core::Data::ExdDataGenerated g_exdDataGen;
|
||||||
|
|
||||||
Core::TerritoryMgr::TerritoryMgr() :
|
Core::TerritoryMgr::TerritoryMgr() :
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#ifndef SAPPHIRE_TERRITORYMGR_H
|
#ifndef SAPPHIRE_TERRITORYMGR_H
|
||||||
#define SAPPHIRE_TERRITORYMGR_H
|
#define SAPPHIRE_TERRITORYMGR_H
|
||||||
|
|
||||||
#include <common/Exd/ExdData.h>
|
#include <common/Exd/ExdDataGenerated.h>
|
||||||
#include "Forwards.h"
|
#include "Forwards.h"
|
||||||
#include <set>
|
#include <set>
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue