mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-26 14:37:44 +00:00
Code Activity

Removal of outdated Globals.h

Browse source
This commit is contained in:
Mordred 2017-08-17 18:12:29 +02:00
parent 990a984312
commit 5c8055a587
3 changed files with 15 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/servers/Server_Zone/GameCommandHandler.cpp
View file

@ -6,6 +6,8 @@
#include <Server_Common/CommonNetwork.h>
#include <Server_Common/UtilMath.h>
#include <Server_Common/PacketContainer.h>
#include <Server_Common/Logger.h>
#include <Server_Common/ExdData.h>
#include "GameCommand.h"
#include "GameCommandHandler.h"
@ -15,20 +17,24 @@
#include "ActorControlPacket143.h"
#include "InitUIPacket.h"
#include "GameConnection.h"
#include "ScriptManager.h"
#include "Player.h"
#include "BattleNpc.h"
#include "Zone.h"
#include "Globals.h"
#include "ServerZone.h"
#include "StatusEffect.h"
#include "Session.h"
#include <boost/make_shared.hpp>
extern Core::Db::Database g_database;
extern Core::Scripting::ScriptManager g_scriptMgr;
extern Core::Data::ExdData g_exdData;
extern Core::Logger g_log;
extern Core::ServerZone g_serverZone;
// instanciate and initialize commands
Core::GameCommandHandler::GameCommandHandler()

18
src/servers/Server_Zone/Globals.h
View file

@ -1,18 +0,0 @@
#ifndef _GLOBALS_H
#define _GLOBALS_H
#include "ZoneMgr.h"
#include <Server_Common/Logger.h>
#include <Server_Common/Database.h>
#include "ServerZone.h"
#include "ScriptManager.h"
#include <Server_Common/ExdData.h>
extern Core::Logger g_log;
extern Core::Db::Database g_database;
extern Core::ServerZone g_serverZone;
extern Core::ZoneMgr g_zoneMgr;
extern Core::Scripting::ScriptManager g_scriptMgr;
extern Core::Data::ExdData g_exdData;
#endif

24
src/servers/Server_Zone/SkillHandler.cpp
View file

@ -1,48 +1,38 @@
#include <Server_Common/Common.h>
#include <Server_Common/CommonNetwork.h>
#include <Server_Common/Database.h>
#include <Server_Common/ExdData.h>
#include <Server_Common/GamePacketNew.h>
#include <Server_Common/PacketContainer.h>
#include <Server_Common/Logger.h>
#include <boost/format.hpp>
#include "GameConnection.h"
#include "Session.h"
#include "Zone.h"
#include "ZonePosition.h"
#include "InitUIPacket.h"
#include "PingPacket.h"
#include "MoveActorPacket.h"
#include "ChatPacket.h"
#include "ServerNoticePacket.h"
#include "ActorControlPacket142.h"
#include "ActorControlPacket143.h"
#include "ActorControlPacket144.h"
#include "EventStartPacket.h"
#include "EventFinishPacket.h"
#include "PlayerStateFlagsPacket.h"
#include "PlayerStateFlagsPacket.h"
#include "GameCommandHandler.h"
#include "Player.h"
#include "Inventory.h"
#include "Globals.h"
#include "Forwards.h"
#include "EventHelper.h"
#include "Action.h"
#include "ActionTeleport.h"
#include "ActionCast.h"
#include "ScriptManager.h"
extern Core::GameCommandHandler g_gameCommandMgr;
extern Core::Scripting::ScriptManager g_scriptMgr;
extern Core::Data::ExdData g_exdData;
extern Core::Logger g_log;
using namespace Core::Common;
using namespace Core::Network::Packets;