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

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
Minho Kang 2017-08-19 00:49:54 +09:00
commit 8979bcdd8f
83 changed files with 493 additions and 521 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CMakeLists.txt
View file

@ -1,3 +1,4 @@
cmake_policy(SET CMP0014 NEW)
cmake_minimum_required(VERSION 2.6) cmake_minimum_required(VERSION 2.6)
project (Sapphire) project (Sapphire)

0
src/servers/Server_Zone/Action.cpp → src/servers/Server_Zone/Action/Action.cpp
View file

2
src/servers/Server_Zone/Action.h → src/servers/Server_Zone/Action/Action.h
View file

@ -2,7 +2,7 @@
#define _ACTION_H_ #define _ACTION_H_
#include <Server_Common/Common.h> #include <Server_Common/Common.h>
#include "Forwards.h" #include "src/servers/Server_Zone/Forwards.h"
namespace Core { namespace Action { namespace Core { namespace Action {

8
src/servers/Server_Zone/ActionCast.cpp → src/servers/Server_Zone/Action/ActionCast.cpp
View file

@ -6,10 +6,10 @@
#include <Server_Common/ExdData.h> #include <Server_Common/ExdData.h>
#include <Server_Common/Logger.h> #include <Server_Common/Logger.h>
#include "ActorControlPacket142.h" #include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket142.h"
#include "ActorControlPacket143.h" #include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket143.h"
#include "Player.h" #include "src/servers/Server_Zone/Actor/Player.h"
#include "ScriptManager.h" #include "src/servers/Server_Zone/Script/ScriptManager.h"
using namespace Core::Common; using namespace Core::Common;
using namespace Core::Network; using namespace Core::Network;

2
src/servers/Server_Zone/ActionCast.h → src/servers/Server_Zone/Action/ActionCast.h
View file

@ -1,7 +1,7 @@
#ifndef _ACTIONCAST_H_ #ifndef _ACTIONCAST_H_
#define _ACTIONCAST_H_ #define _ACTIONCAST_H_
#include "Forwards.h" #include "src/servers/Server_Zone/Forwards.h"
#include "Action.h" #include "Action.h"
namespace Core { namespace Action { namespace Core { namespace Action {

6
src/servers/Server_Zone/ActionTeleport.cpp → src/servers/Server_Zone/Action/ActionTeleport.cpp
View file

@ -4,9 +4,9 @@
#include <Server_Common/ExdData.h> #include <Server_Common/ExdData.h>
#include <Server_Common/Logger.h> #include <Server_Common/Logger.h>
#include "ActorControlPacket142.h" #include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket142.h"
#include "ActorControlPacket143.h" #include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket143.h"
#include "Player.h" #include "src/servers/Server_Zone/Actor/Player.h"
using namespace Core::Common; using namespace Core::Common;
using namespace Core::Network; using namespace Core::Network;

2
src/servers/Server_Zone/ActionTeleport.h → src/servers/Server_Zone/Action/ActionTeleport.h
View file

@ -1,7 +1,7 @@
#ifndef _ACTIONTELEPORT_H_ #ifndef _ACTIONTELEPORT_H_
#define _ACTIONTELEPORT_H_ #define _ACTIONTELEPORT_H_
#include "Forwards.h" #include "src/servers/Server_Zone/Forwards.h"
#include "Action.h" #include "Action.h"
namespace Core { namespace Action { namespace Core { namespace Action {

8
src/servers/Server_Zone/EventAction.cpp → src/servers/Server_Zone/Action/EventAction.cpp
View file

@ -3,10 +3,10 @@
#include <Server_Common/ExdData.h> #include <Server_Common/ExdData.h>
#include "EventAction.h" #include "EventAction.h"
#include "ActorControlPacket142.h" #include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket142.h"
#include "ActorControlPacket143.h" #include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket143.h"
#include "Player.h" #include "src/servers/Server_Zone/Actor/Player.h"
#include "Event.h" #include "src/servers/Server_Zone/Event/Event.h"
extern Core::Logger g_log; extern Core::Logger g_log;
extern Core::Data::ExdData g_exdData; extern Core::Data::ExdData g_exdData;

4
src/servers/Server_Zone/EventAction.h → src/servers/Server_Zone/Action/EventAction.h
View file

@ -3,8 +3,8 @@
#include <Server_Common/Common.h> #include <Server_Common/Common.h>
#include "Forwards.h" #include "src/servers/Server_Zone/Forwards.h"
#include "Action.h" #include "src/servers/Server_Zone/Action/Action.h"
namespace Core { namespace Action { namespace Core { namespace Action {

9
src/servers/Server_Zone/EventItemAction.cpp → src/servers/Server_Zone/Action/EventItemAction.cpp
View file

@ -1,11 +1,14 @@
#include "EventItemAction.h" #include "EventItemAction.h"
#include "ActorControlPacket142.h"
#include "ActorControlPacket143.h"
#include <Server_Common/Util.h> #include <Server_Common/Util.h>
#include <Server_Common/UtilMath.h> #include <Server_Common/UtilMath.h>
#include <Server_Common/Logger.h> #include <Server_Common/Logger.h>
#include <string.h> #include <string.h>
#include "Player.h"
#include "src/servers/Server_Zone/Actor/Player.h"
#include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket142.h"
#include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket143.h"
extern Core::Logger g_log; extern Core::Logger g_log;

4
src/servers/Server_Zone/EventItemAction.h → src/servers/Server_Zone/Action/EventItemAction.h
View file

@ -1,8 +1,8 @@
#ifndef _EVENTITEMACTION_H_ #ifndef _EVENTITEMACTION_H_
#define _EVENTITEMACTION_H_ #define _EVENTITEMACTION_H_
#include "Forwards.h" #include "src/servers/Server_Zone/Forwards.h"
#include "Action.h" #include "src/servers/Server_Zone/Action/Action.h"
namespace Core { namespace Action { namespace Core { namespace Action {

24
src/servers/Server_Zone/Actor.cpp → src/servers/Server_Zone/Actor/Actor.cpp
View file

@ -2,21 +2,21 @@
#include <Server_Common/UtilMath.h> #include <Server_Common/UtilMath.h>
#include <Server_Common/PacketContainer.h> #include <Server_Common/PacketContainer.h>
#include "Forwards.h" #include "src/servers/Server_Zone/Forwards.h"
#include "Action.h" #include "src/servers/Server_Zone/Action/Action.h"
#include "Actor.h" #include "Actor.h"
#include "Zone.h" #include "src/servers/Server_Zone/Zone/Zone.h"
#include <Server_Common/GamePacket.h> #include <Server_Common/GamePacket.h>
#include "GameConnection.h" #include "src/servers/Server_Zone/Network/GameConnection.h"
#include "ActorControlPacket142.h" #include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket142.h"
#include "ActorControlPacket143.h" #include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket143.h"
#include "ActorControlPacket144.h" #include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket144.h"
#include "UpdateHpMpTpPacket.h" #include "src/servers/Server_Zone/Network/PacketWrappers/UpdateHpMpTpPacket.h"
#include "StatusEffectContainer.h" #include "src/servers/Server_Zone/StatusEffect/StatusEffectContainer.h"
#include "StatusEffect.h" #include "src/servers/Server_Zone/StatusEffect/StatusEffect.h"
#include "ServerZone.h" #include "src/servers/Server_Zone/ServerZone.h"
#include "Session.h" #include "src/servers/Server_Zone/Session.h"
#include "Player.h" #include "Player.h"
extern Core::ServerZone g_serverZone; extern Core::ServerZone g_serverZone;

2
src/servers/Server_Zone/Actor.h → src/servers/Server_Zone/Actor/Actor.h
View file

@ -4,7 +4,7 @@
#include <Server_Common/Common.h> #include <Server_Common/Common.h>
#include <boost/enable_shared_from_this.hpp> #include <boost/enable_shared_from_this.hpp>
#include "Forwards.h" #include "src/servers/Server_Zone/Forwards.h"
#include <set> #include <set>
#include <map> #include <map>

8
src/servers/Server_Zone/BattleNpc.cpp → src/servers/Server_Zone/Actor/BattleNpc.cpp
View file

@ -12,10 +12,10 @@
#include "Player.h" #include "Player.h"
#include "BattleNpc.h" #include "BattleNpc.h"
#include "MoveActorPacket.h" #include "src/servers/Server_Zone/Network/PacketWrappers/MoveActorPacket.h"
#include "ActorControlPacket142.h" #include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket142.h"
#include "ActorControlPacket143.h" #include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket143.h"
#include "StatusEffectContainer.h" #include "src/servers/Server_Zone/StatusEffect/StatusEffectContainer.h"
using namespace Core::Common; using namespace Core::Common;
using namespace Core::Network::Packets; using namespace Core::Network::Packets;

0
src/servers/Server_Zone/BattleNpc.h → src/servers/Server_Zone/Actor/BattleNpc.h
View file

0
src/servers/Server_Zone/BattleNpcTemplate.cpp → src/servers/Server_Zone/Actor/BattleNpcTemplate.cpp
View file

0
src/servers/Server_Zone/BattleNpcTemplate.h → src/servers/Server_Zone/Actor/BattleNpcTemplate.h
View file

48
src/servers/Server_Zone/Player.cpp → src/servers/Server_Zone/Actor/Player.cpp
View file

@ -8,42 +8,42 @@
#include <Server_Common/ExdData.h> #include <Server_Common/ExdData.h>
#include <Server_Common/PacketContainer.h> #include <Server_Common/PacketContainer.h>
#include "Session.h" #include "src/servers/Server_Zone/Session.h"
#include "Player.h" #include "Player.h"
#include "BattleNpc.h" #include "BattleNpc.h"
#include "ZoneMgr.h" #include "src/servers/Server_Zone/Zone/ZoneMgr.h"
#include "Zone.h" #include "src/servers/Server_Zone/Zone/Zone.h"
#include "ServerZone.h" #include "src/servers/Server_Zone/ServerZone.h"
#include "GameConnection.h" #include "src/servers/Server_Zone/Network/GameConnection.h"
#include "ActorControlPacket142.h" #include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket142.h"
#include "ActorControlPacket143.h" #include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket143.h"
#include "InitUIPacket.h" #include "src/servers/Server_Zone/Network/PacketWrappers/InitUIPacket.h"
#include "ServerNoticePacket.h" #include "src/servers/Server_Zone/Network/PacketWrappers/ServerNoticePacket.h"
#include "ChatPacket.h" #include "src/servers/Server_Zone/Network/PacketWrappers/ChatPacket.h"
#include "ModelEquipPacket.h" #include "src/servers/Server_Zone/Network/PacketWrappers/ModelEquipPacket.h"
#include "ActorSpawnPacket.h" #include "src/servers/Server_Zone/Network/PacketWrappers/ActorSpawnPacket.h"
#include "UpdateHpMpTpPacket.h" #include "src/servers/Server_Zone/Network/PacketWrappers/UpdateHpMpTpPacket.h"
#include "PlayerStateFlagsPacket.h" #include "src/servers/Server_Zone/Network/PacketWrappers/PlayerStateFlagsPacket.h"
#include "PlayerSpawnPacket.h" #include "src/servers/Server_Zone/Network/PacketWrappers/PlayerSpawnPacket.h"
#include "ScriptManager.h" #include "src/servers/Server_Zone/Script/ScriptManager.h"
#include "StatusEffectContainer.h" #include "src/servers/Server_Zone/StatusEffect/StatusEffectContainer.h"
#include "Item.h" #include "src/servers/Server_Zone/Inventory/Item.h"
#include "Inventory.h" #include "src/servers/Server_Zone/Inventory/Inventory.h"
#include "Event.h" #include "src/servers/Server_Zone/Event/Event.h"
#include "Action.h" #include "src/servers/Server_Zone/Action/Action.h"
#include "EventAction.h" #include "src/servers/Server_Zone/Action/EventAction.h"
#include "EventItemAction.h" #include "src/servers/Server_Zone/Action/EventItemAction.h"
#include "ZonePosition.h" #include "src/servers/Server_Zone/Zone/ZonePosition.h"
#include <boost/make_shared.hpp> #include <boost/make_shared.hpp>
extern Core::Logger g_log; extern Core::Logger g_log;

4
src/servers/Server_Zone/Player.h → src/servers/Server_Zone/Actor/Player.h
View file

@ -1,12 +1,12 @@
#ifndef _PLAYER_H #ifndef _PLAYER_H
#define _PLAYER_H #define _PLAYER_H
#include "Forwards.h" #include "src/servers/Server_Zone/Forwards.h"
#include <Server_Common/Common.h> #include <Server_Common/Common.h>
#include "Actor.h" #include "Actor.h"
#include "Inventory.h" #include "src/servers/Server_Zone/Inventory/Inventory.h"
#include <map> #include <map>
#include <queue> #include <queue>

20
src/servers/Server_Zone/PlayerEvent.cpp → src/servers/Server_Zone/Actor/PlayerEvent.cpp
View file

@ -5,19 +5,19 @@
#include "Player.h" #include "Player.h"
#include "Zone.h" #include "src/servers/Server_Zone/Zone/Zone.h"
#include "Forwards.h" #include "src/servers/Server_Zone/Forwards.h"
#include "GameConnection.h" #include "src/servers/Server_Zone/Network/GameConnection.h"
#include "ActorControlPacket142.h" #include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket142.h"
#include "InitUIPacket.h" #include "src/servers/Server_Zone/Network/PacketWrappers/InitUIPacket.h"
#include "ServerNoticePacket.h" #include "src/servers/Server_Zone/Network/PacketWrappers/ServerNoticePacket.h"
#include "EventStartPacket.h" #include "src/servers/Server_Zone/Network/PacketWrappers/EventStartPacket.h"
#include "EventPlayPacket.h" #include "src/servers/Server_Zone/Network/PacketWrappers/EventPlayPacket.h"
#include "EventFinishPacket.h" #include "src/servers/Server_Zone/Network/PacketWrappers/EventFinishPacket.h"
#include "Event.h" #include "src/servers/Server_Zone/Event/Event.h"
extern Core::Logger g_log; extern Core::Logger g_log;

10
src/servers/Server_Zone/PlayerInventory.cpp → src/servers/Server_Zone/Actor/PlayerInventory.cpp
View file

@ -2,15 +2,15 @@
#include "Player.h" #include "Player.h"
#include "ZoneMgr.h" #include "src/servers/Server_Zone/Zone/ZoneMgr.h"
#include "Zone.h" #include "src/servers/Server_Zone/Zone/Zone.h"
#include <Server_Common/GamePacket.h> #include <Server_Common/GamePacket.h>
#include "ActorControlPacket143.h" #include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket143.h"
#include "Inventory.h" #include "src/servers/Server_Zone/Inventory/Inventory.h"
#include "Item.h" #include "src/servers/Server_Zone/Inventory/Item.h"
using namespace Core::Common; using namespace Core::Common;
using namespace Core::Network::Packets; using namespace Core::Network::Packets;

8
src/servers/Server_Zone/PlayerQuest.cpp → src/servers/Server_Zone/Actor/PlayerQuest.cpp
View file

@ -5,13 +5,13 @@
#include <Server_Common/ExdData.h> #include <Server_Common/ExdData.h>
#include <Server_Common/PacketContainer.h> #include <Server_Common/PacketContainer.h>
#include "GameConnection.h" #include "src/servers/Server_Zone/Network/GameConnection.h"
#include "QuestMessagePacket.h" #include "src/servers/Server_Zone/Network/PacketWrappers/QuestMessagePacket.h"
#include "Session.h" #include "src/servers/Server_Zone/Session.h"
#include "Player.h" #include "Player.h"
#include "Inventory.h" #include "src/servers/Server_Zone/Inventory/Inventory.h"

16
src/servers/Server_Zone/PlayerSql.cpp → src/servers/Server_Zone/Actor/PlayerSql.cpp
View file

@ -15,17 +15,17 @@
#include "Player.h" #include "Player.h"
#include "ZoneMgr.h" #include "src/servers/Server_Zone/Zone/ZoneMgr.h"
#include "Zone.h" #include "src/servers/Server_Zone/Zone/Zone.h"
#include "ServerZone.h" #include "src/servers/Server_Zone/ServerZone.h"
#include "Forwards.h" #include "src/servers/Server_Zone/Forwards.h"
#include "GameConnection.h" #include "src/servers/Server_Zone/Network/GameConnection.h"
#include "InitUIPacket.h" #include "src/servers/Server_Zone/Network/PacketWrappers/InitUIPacket.h"
#include "StatusEffectContainer.h" #include "src/servers/Server_Zone/StatusEffect/StatusEffectContainer.h"
#include "Inventory.h" #include "src/servers/Server_Zone/Inventory/Inventory.h"
extern Core::Logger g_log; extern Core::Logger g_log;
extern Core::Db::Database g_database; extern Core::Db::Database g_database;

19
src/servers/Server_Zone/CMakeLists.txt
View file

@ -1,13 +1,27 @@
cmake_minimum_required(VERSION 2.6) cmake_minimum_required(VERSION 2.6)
cmake_policy(SET CMP0015 NEW) cmake_policy(SET CMP0015 NEW)
cmake_policy(SET CMP0014 OLD)
project(Sapphire_Zone) project(Sapphire_Zone)
include_directories("../../libraries/external/ChaiScript-6.0.0/include/") include_directories("../../libraries/external/ChaiScript-6.0.0/include/")
include_directories("../../libraries/sapphire/datReader/") include_directories("../../libraries/sapphire/datReader/")
include_directories("../") include_directories("../")
file(GLOB SERVER_PUBLIC_INCLUDE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/*") file(GLOB SERVER_PUBLIC_INCLUDE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/* ${CMAKE_CURRENT_SOURCE_DIR}/Script/*)
file(GLOB SERVER_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}*.c*") file(GLOB SERVER_SOURCE_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
*.c*
Actor/*.c*
Action/*.c*
DebugCommand/*.c*
Event/*.c*
Inventory/*.c*
Network/*.c*
Network/Handlers/*.c*
Network/PacketWrappers/*.c*
Script/*.c*
StatusEffect/*.c*
Zone/*.c*)
set(SERVER_COMMON_DIR ../Server_Common) set(SERVER_COMMON_DIR ../Server_Common)
set(Boost_USE_STATIC_LIBS ON) set(Boost_USE_STATIC_LIBS ON)
@ -55,6 +69,7 @@ else()
endif() endif()
endif() endif()
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/Script)
include_directories(${Boost_INCLUDE_DIR}) include_directories(${Boost_INCLUDE_DIR})

14
src/servers/Server_Zone/GameCommand.h → src/servers/Server_Zone/DebugCommand/DebugCommand.h
View file

@ -3,21 +3,21 @@
#include <Server_Common/Common.h> #include <Server_Common/Common.h>
#include "Player.h" #include "src/servers/Server_Zone/Actor/Player.h"
#include "Forwards.h" #include "src/servers/Server_Zone/Forwards.h"
namespace Core { namespace Core {
class GameCommandHandler; class DebugCommandHandler;
// CGameCommand is used to define in game text command callbacks // CGameCommand is used to define in game text command callbacks
// TODO it should probably be renamed to something more intuitive // TODO it should probably be renamed to something more intuitive
// TODO the command identifier, currently '@' should probably be defined in here aswell so it is easily replaced // TODO the command identifier, currently '@' should probably be defined in here aswell so it is easily replaced
class GameCommand class DebugCommand
{ {
public: public:
typedef void (GameCommandHandler::*pFunc)(char *, Entity::PlayerPtr, boost::shared_ptr<GameCommand>); typedef void ( DebugCommandHandler::*pFunc )( char *, Entity::PlayerPtr, boost::shared_ptr< DebugCommand > );
// String for the command // String for the command
std::string m_commandName; std::string m_commandName;
@ -31,7 +31,7 @@ namespace Core {
// userlevel needed to execute the command // userlevel needed to execute the command
Common::UserLevel m_userLevel; Common::UserLevel m_userLevel;
GameCommand(const std::string& n, pFunc functionPtr, const std::string& hText, Common::UserLevel uLevel) DebugCommand( const std::string& n, pFunc functionPtr, const std::string& hText, Common::UserLevel uLevel )
{ {
m_commandName = n; m_commandName = n;
m_pFunc = functionPtr; m_pFunc = functionPtr;
@ -39,7 +39,7 @@ namespace Core {
m_userLevel = uLevel; m_userLevel = uLevel;
} }
~GameCommand() ~DebugCommand()
{ {
} }

68
src/servers/Server_Zone/GameCommandHandler.cpp → src/servers/Server_Zone/DebugCommand/DebugCommandHandler.cpp
View file

@ -9,25 +9,25 @@
#include <Server_Common/Logger.h> #include <Server_Common/Logger.h>
#include <Server_Common/ExdData.h> #include <Server_Common/ExdData.h>
#include "GameCommand.h" #include "DebugCommand.h"
#include "GameCommandHandler.h" #include "DebugCommandHandler.h"
#include "ServerNoticePacket.h" #include "src/servers/Server_Zone/Network/PacketWrappers/ServerNoticePacket.h"
#include "ActorControlPacket142.h" #include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket142.h"
#include "ActorControlPacket143.h" #include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket143.h"
#include "InitUIPacket.h" #include "src/servers/Server_Zone/Network/PacketWrappers/InitUIPacket.h"
#include "GameConnection.h" #include "src/servers/Server_Zone/Network/GameConnection.h"
#include "ScriptManager.h" #include "src/servers/Server_Zone/Script/ScriptManager.h"
#include "Player.h" #include "src/servers/Server_Zone/Actor/Player.h"
#include "BattleNpc.h" #include "src/servers/Server_Zone/Actor/BattleNpc.h"
#include "Zone.h" #include "src/servers/Server_Zone/Zone/Zone.h"
#include "ServerZone.h" #include "src/servers/Server_Zone/ServerZone.h"
#include "StatusEffect.h" #include "src/servers/Server_Zone/StatusEffect/StatusEffect.h"
#include "Session.h" #include "src/servers/Server_Zone/Session.h"
#include <boost/make_shared.hpp> #include <boost/make_shared.hpp>
extern Core::Db::Database g_database; extern Core::Db::Database g_database;
@ -37,40 +37,40 @@ extern Core::Logger g_log;
extern Core::ServerZone g_serverZone; extern Core::ServerZone g_serverZone;
// instanciate and initialize commands // instanciate and initialize commands
Core::GameCommandHandler::GameCommandHandler() Core::DebugCommandHandler::DebugCommandHandler()
{ {
// Push all commands onto the register map // Push all commands onto the register map
registerCommand( "set", &GameCommandHandler::set, "Loads and injects a premade Packet.", Common::UserLevel::all ); registerCommand( "set", &DebugCommandHandler::set, "Loads and injects a premade Packet.", Common::UserLevel::all );
registerCommand( "get", &GameCommandHandler::get, "Loads and injects a premade Packet.", Common::UserLevel::all ); registerCommand( "get", &DebugCommandHandler::get, "Loads and injects a premade Packet.", Common::UserLevel::all );
registerCommand( "add", &GameCommandHandler::add, "Loads and injects a premade Packet.", Common::UserLevel::all ); registerCommand( "add", &DebugCommandHandler::add, "Loads and injects a premade Packet.", Common::UserLevel::all );
//registerCommand( "debug", &GameCommandHandler::debug, "Loads and injects a premade Packet.", Common::UserLevel::all ); //registerCommand( "debug", &DebugCommandHandler::debug, "Loads and injects a premade Packet.", Common::UserLevel::all );
registerCommand( "inject", &GameCommandHandler::injectPacket, "Loads and injects a premade Packet.", Common::UserLevel::all ); registerCommand( "inject", &DebugCommandHandler::injectPacket, "Loads and injects a premade Packet.", Common::UserLevel::all );
registerCommand( "script_reload", &GameCommandHandler::scriptReload, "Loads and injects a premade Packet.", Common::UserLevel::all ); registerCommand( "script_reload", &DebugCommandHandler::scriptReload, "Loads and injects a premade Packet.", Common::UserLevel::all );
registerCommand( "nudge", &GameCommandHandler::nudge, "Nudges you forward/up/down", Common::UserLevel::all ); registerCommand( "nudge", &DebugCommandHandler::nudge, "Nudges you forward/up/down", Common::UserLevel::all );
} }
// clear all loaded commands // clear all loaded commands
Core::GameCommandHandler::~GameCommandHandler() Core::DebugCommandHandler::~DebugCommandHandler()
{ {
for( auto it = m_commandMap.begin(); it != m_commandMap.end(); ++it ) for( auto it = m_commandMap.begin(); it != m_commandMap.end(); ++it )
( *it ).second.reset(); ( *it ).second.reset();
} }
// add a command set to the register map // add a command set to the register map
void Core::GameCommandHandler::registerCommand( const std::string& n, Core::GameCommand::pFunc functionPtr, void Core::DebugCommandHandler::registerCommand( const std::string& n, Core::DebugCommand::pFunc functionPtr,
const std::string& hText, Core::Common::UserLevel uLevel ) const std::string& hText, Core::Common::UserLevel uLevel )
{ {
m_commandMap[std::string( n )] = boost::make_shared<GameCommand>( n, functionPtr, hText, uLevel ); m_commandMap[std::string( n )] = boost::make_shared<DebugCommand>( n, functionPtr, hText, uLevel );
} }
// try to retrieve the command in question, execute if found // try to retrieve the command in question, execute if found
void Core::GameCommandHandler::execCommand( char * data, Core::Entity::PlayerPtr pPlayer ) void Core::DebugCommandHandler::execCommand( char * data, Core::Entity::PlayerPtr pPlayer )
{ {
// define callback pointer // define callback pointer
void ( GameCommandHandler::*pf )( char *, Entity::PlayerPtr, boost::shared_ptr< GameCommand > ); void ( DebugCommandHandler::*pf )( char *, Entity::PlayerPtr, boost::shared_ptr< DebugCommand > );
std::string commandString; std::string commandString;
@ -109,13 +109,13 @@ void Core::GameCommandHandler::execCommand( char * data, Core::Entity::PlayerPtr
// Definition of the commands // Definition of the commands
/////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////
void Core::GameCommandHandler::scriptReload( char * data, Core::Entity::PlayerPtr pPlayer, void Core::DebugCommandHandler::scriptReload( char * data, Core::Entity::PlayerPtr pPlayer,
boost::shared_ptr<Core::GameCommand> command ) boost::shared_ptr<Core::DebugCommand> command )
{ {
g_scriptMgr.reload(); g_scriptMgr.reload();
} }
void Core::GameCommandHandler::set( char * data, Core::Entity::PlayerPtr pPlayer, boost::shared_ptr<Core::GameCommand> command ) void Core::DebugCommandHandler::set( char * data, Core::Entity::PlayerPtr pPlayer, boost::shared_ptr<Core::DebugCommand> command )
{ {
std::string subCommand = ""; std::string subCommand = "";
std::string params = ""; std::string params = "";
@ -285,7 +285,7 @@ void Core::GameCommandHandler::set( char * data, Core::Entity::PlayerPtr pPlayer
} }
void Core::GameCommandHandler::add( char * data, Core::Entity::PlayerPtr pPlayer, boost::shared_ptr<Core::GameCommand> command ) void Core::DebugCommandHandler::add( char * data, Core::Entity::PlayerPtr pPlayer, boost::shared_ptr<Core::DebugCommand> command )
{ {
std::string subCommand; std::string subCommand;
std::string params = ""; std::string params = "";
@ -421,7 +421,7 @@ void Core::GameCommandHandler::add( char * data, Core::Entity::PlayerPtr pPlayer
} }
void Core::GameCommandHandler::get( char * data, Core::Entity::PlayerPtr pPlayer, boost::shared_ptr<Core::GameCommand> command ) void Core::DebugCommandHandler::get( char * data, Core::Entity::PlayerPtr pPlayer, boost::shared_ptr<Core::DebugCommand> command )
{ {
std::string subCommand; std::string subCommand;
std::string params = ""; std::string params = "";
@ -461,14 +461,14 @@ void Core::GameCommandHandler::get( char * data, Core::Entity::PlayerPtr pPlayer
} }
void Core::GameCommandHandler::injectPacket( char * data, Core::Entity::PlayerPtr pPlayer, boost::shared_ptr< Core::GameCommand > command ) void Core::DebugCommandHandler::injectPacket( char * data, Core::Entity::PlayerPtr pPlayer, boost::shared_ptr< Core::DebugCommand > command )
{ {
auto pSession = g_serverZone.getSession( pPlayer->getId() ); auto pSession = g_serverZone.getSession( pPlayer->getId() );
if( pSession ) if( pSession )
pSession->getZoneConnection()->injectPacket( data + 7, pPlayer ); pSession->getZoneConnection()->injectPacket( data + 7, pPlayer );
} }
void Core::GameCommandHandler::nudge( char * data, Entity::PlayerPtr pPlayer, boost::shared_ptr<GameCommand> command ) void Core::DebugCommandHandler::nudge( char * data, Entity::PlayerPtr pPlayer, boost::shared_ptr<DebugCommand> command )
{ {
std::string subCommand; std::string subCommand;

28
src/servers/Server_Zone/GameCommandHandler.h → src/servers/Server_Zone/DebugCommand/DebugCommandHandler.h
View file

@ -3,39 +3,39 @@
#include <map> #include <map>
#include "GameCommand.h" #include "DebugCommand.h"
#include <Server_Common/Common.h> #include <Server_Common/Common.h>
#include "Forwards.h" #include "src/servers/Server_Zone/Forwards.h"
namespace Core { namespace Core {
// handler for in game commands // handler for in game commands
class GameCommandHandler class DebugCommandHandler
{ {
private: private:
// container mapping command string to command object // container mapping command string to command object
std::map<std::string, boost::shared_ptr<GameCommand> > m_commandMap; std::map<std::string, boost::shared_ptr<DebugCommand> > m_commandMap;
public: public:
GameCommandHandler(); DebugCommandHandler();
~GameCommandHandler(); ~DebugCommandHandler();
// register command to command map // register command to command map
void registerCommand( const std::string& n, GameCommand::pFunc, const std::string& hText, Common::UserLevel uLevel ); void registerCommand( const std::string& n, DebugCommand::pFunc, const std::string& hText, Common::UserLevel uLevel );
// execute command if registered // execute command if registered
void execCommand( char * data, Entity::PlayerPtr pPlayer ); void execCommand( char * data, Entity::PlayerPtr pPlayer );
// command handler callbacks // command handler callbacks
void set( char * data, Entity::PlayerPtr pPlayer, boost::shared_ptr<GameCommand> command ); void set( char * data, Entity::PlayerPtr pPlayer, boost::shared_ptr<DebugCommand> command );
void get( char * data, Entity::PlayerPtr pPlayer, boost::shared_ptr<GameCommand> command ); void get( char * data, Entity::PlayerPtr pPlayer, boost::shared_ptr<DebugCommand> command );
void add( char * data, Entity::PlayerPtr pPlayer, boost::shared_ptr<GameCommand> command ); void add( char * data, Entity::PlayerPtr pPlayer, boost::shared_ptr<DebugCommand> command );
//void debug( char * data, Entity::PlayerPtr pPlayer, boost::shared_ptr<GameCommand> command ); //void debug( char * data, Entity::PlayerPtr pPlayer, boost::shared_ptr<DebugCommand> command );
void scriptReload( char * data, Entity::PlayerPtr pPlayer, boost::shared_ptr<GameCommand> command ); void scriptReload( char * data, Entity::PlayerPtr pPlayer, boost::shared_ptr<DebugCommand> command );
void injectPacket( char * data, Entity::PlayerPtr pPlayer, boost::shared_ptr<GameCommand> command ); void injectPacket( char * data, Entity::PlayerPtr pPlayer, boost::shared_ptr<DebugCommand> command );
void nudge( char* data, Entity::PlayerPtr pPlayer, boost::shared_ptr<GameCommand> command ); void nudge( char* data, Entity::PlayerPtr pPlayer, boost::shared_ptr<DebugCommand> command );
}; };

0
src/servers/Server_Zone/Event.cpp → src/servers/Server_Zone/Event/Event.cpp
View file

2
src/servers/Server_Zone/Event.h → src/servers/Server_Zone/Event/Event.h
View file

@ -1,7 +1,7 @@
#ifndef _EVENT_H #ifndef _EVENT_H
#define _EVENT_H #define _EVENT_H
#include "Forwards.h" #include "../Forwards.h"
namespace Core { namespace Core {
namespace Event { namespace Event {

0
src/servers/Server_Zone/EventHelper.cpp → src/servers/Server_Zone/Event/EventHelper.cpp
View file

0
src/servers/Server_Zone/EventHelper.h → src/servers/Server_Zone/Event/EventHelper.h
View file

8
src/servers/Server_Zone/Inventory.cpp → src/servers/Server_Zone/Inventory/Inventory.cpp
View file

@ -6,17 +6,17 @@
#include "Inventory.h" #include "Inventory.h"
#include "Player.h" #include "src/servers/Server_Zone/Actor/Player.h"
#include "ItemContainer.h" #include "ItemContainer.h"
#include "Item.h" #include "Item.h"
#include "ServerNoticePacket.h" #include "src/servers/Server_Zone/Network/PacketWrappers/ServerNoticePacket.h"
#include <boost/lexical_cast.hpp> #include <boost/lexical_cast.hpp>
#include "Forwards.h" #include "src/servers/Server_Zone/Forwards.h"
#include "ActorControlPacket143.h" #include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket143.h"
extern Core::Logger g_log; extern Core::Logger g_log;
extern Core::Db::Database g_database; extern Core::Db::Database g_database;

2
src/servers/Server_Zone/Inventory.h → src/servers/Server_Zone/Inventory/Inventory.h
View file

@ -2,7 +2,7 @@
#define INVENTORY_H_ #define INVENTORY_H_
#include <map> #include <map>
#include <Server_Common/Common.h> #include <Server_Common/Common.h>
#include "Forwards.h" #include "src/servers/Server_Zone/Forwards.h"
namespace Core namespace Core
{ {

0
src/servers/Server_Zone/Item.cpp → src/servers/Server_Zone/Inventory/Item.cpp
View file

0
src/servers/Server_Zone/Item.h → src/servers/Server_Zone/Inventory/Item.h
View file

4
src/servers/Server_Zone/ItemContainer.cpp → src/servers/Server_Zone/Inventory/ItemContainer.cpp
View file

@ -1,11 +1,11 @@
#include "Forwards.h" #include "src/servers/Server_Zone/Forwards.h"
#include "ItemContainer.h" #include "ItemContainer.h"
#include <Server_Common/Common.h> #include <Server_Common/Common.h>
#include <Server_Common/Logger.h> #include <Server_Common/Logger.h>
#include <Server_Common/Database.h> #include <Server_Common/Database.h>
#include "Player.h" #include "src/servers/Server_Zone/Actor/Player.h"
#include "Item.h" #include "Item.h"

2
src/servers/Server_Zone/ItemContainer.h → src/servers/Server_Zone/Inventory/ItemContainer.h
View file

@ -6,7 +6,7 @@
#include <Server_Common/Common.h> #include <Server_Common/Common.h>
#include "Forwards.h" #include "../Forwards.h"
namespace Core namespace Core
{ {

21
src/servers/Server_Zone/GameConnection.cpp → src/servers/Server_Zone/Network/GameConnection.cpp
View file

@ -9,20 +9,15 @@
#include "GameConnection.h" #include "GameConnection.h"
#include "ServerZone.h" #include "src/servers/Server_Zone/ServerZone.h"
#include "src/servers/Server_Zone/Session.h"
#include "src/servers/Server_Zone/Zone/Zone.h"
#include "src/servers/Server_Zone/Network/PacketWrappers/InitUIPacket.h"
#include "src/servers/Server_Zone/DebugCommand/DebugCommandHandler.h"
#include "src/servers/Server_Zone/Actor/Player.h"
#include "src/servers/Server_Zone/Forwards.h"
#include "Session.h" extern Core::DebugCommandHandler g_gameCommandMgr;
#include "Zone.h"
#include "InitUIPacket.h"
#include "GameCommandHandler.h"
#include "Player.h"
#include "Forwards.h"
extern Core::GameCommandHandler g_gameCommandMgr;
extern Core::Logger g_log; extern Core::Logger g_log;
extern Core::ServerZone g_serverZone; extern Core::ServerZone g_serverZone;

2
src/servers/Server_Zone/GameConnection.h → src/servers/Server_Zone/Network/GameConnection.h
View file

@ -10,7 +10,7 @@
#include <Server_Common/LockedQueue.h> #include <Server_Common/LockedQueue.h>
#include "Forwards.h" #include "src/servers/Server_Zone/Forwards.h"
#define DECLARE_HANDLER( x ) void x( const Packets::GamePacket& inPacket, Entity::PlayerPtr pPlayer ) #define DECLARE_HANDLER( x ) void x( const Packets::GamePacket& inPacket, Entity::PlayerPtr pPlayer )

55
src/servers/Server_Zone/ActionHandler.cpp → src/servers/Server_Zone/Network/Handlers/ActionHandler.cpp
View file

@ -9,45 +9,40 @@
#include <boost/format.hpp> #include <boost/format.hpp>
#include "GameConnection.h" #include "src/servers/Server_Zone/Network/GameConnection.h"
#include "Session.h" #include "src/servers/Server_Zone/Session.h"
#include "Zone.h" #include "src/servers/Server_Zone/Zone/Zone.h"
#include "ZonePosition.h" #include "src/servers/Server_Zone/Zone/ZonePosition.h"
#include "ServerZone.h" #include "src/servers/Server_Zone/ServerZone.h"
#include "ZoneMgr.h" #include "src/servers/Server_Zone/Zone/ZoneMgr.h"
#include "InitUIPacket.h" #include "src/servers/Server_Zone/Network/PacketWrappers/InitUIPacket.h"
#include "PingPacket.h" #include "src/servers/Server_Zone/Network/PacketWrappers/PingPacket.h"
#include "MoveActorPacket.h" #include "src/servers/Server_Zone/Network/PacketWrappers/MoveActorPacket.h"
#include "ChatPacket.h" #include "src/servers/Server_Zone/Network/PacketWrappers/ChatPacket.h"
#include "ServerNoticePacket.h" #include "src/servers/Server_Zone/Network/PacketWrappers/ServerNoticePacket.h"
#include "ActorControlPacket142.h" #include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket142.h"
#include "ActorControlPacket143.h" #include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket143.h"
#include "ActorControlPacket144.h" #include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket144.h"
#include "EventStartPacket.h" #include "src/servers/Server_Zone/Network/PacketWrappers/EventStartPacket.h"
#include "EventFinishPacket.h" #include "src/servers/Server_Zone/Network/PacketWrappers/EventFinishPacket.h"
#include "PlayerStateFlagsPacket.h" #include "src/servers/Server_Zone/Network/PacketWrappers/PlayerStateFlagsPacket.h"
#include "src/servers/Server_Zone/DebugCommand/DebugCommandHandler.h"
#include "GameCommandHandler.h" #include "src/servers/Server_Zone/Actor/Player.h"
#include "src/servers/Server_Zone/Inventory/Inventory.h"
#include "Player.h" #include "src/servers/Server_Zone/Forwards.h"
#include "Inventory.h" #include "src/servers/Server_Zone/Event/EventHelper.h"
#include "src/servers/Server_Zone/Action/Action.h"
#include "Forwards.h" #include "src/servers/Server_Zone/Action/ActionTeleport.h"
#include "EventHelper.h"
#include "Action.h"
#include "ActionTeleport.h"
extern Core::Logger g_log; extern Core::Logger g_log;
extern Core::Db::Database g_database; extern Core::Db::Database g_database;
extern Core::ServerZone g_serverZone; extern Core::ServerZone g_serverZone;
extern Core::ZoneMgr g_zoneMgr; extern Core::ZoneMgr g_zoneMgr;
extern Core::Data::ExdData g_exdData; extern Core::Data::ExdData g_exdData;
extern Core::GameCommandHandler g_gameCommandMgr; extern Core::DebugCommandHandler g_gameCommandMgr;
using namespace Core::Common; using namespace Core::Common;
using namespace Core::Network::Packets; using namespace Core::Network::Packets;

25
src/servers/Server_Zone/CFHandlers.cpp → src/servers/Server_Zone/Network/Handlers/CFHandlers.cpp
View file

@ -1,26 +1,19 @@
#include <Server_Common/Common.h> #include <Server_Common/Common.h>
#include <Server_Common/CommonNetwork.h> #include <Server_Common/CommonNetwork.h>
#include <Server_Common/GamePacketNew.h> #include <Server_Common/GamePacketNew.h>
#include <Server_Common/Logger.h> #include <Server_Common/Logger.h>
#include <Server_Common/PacketContainer.h> #include <Server_Common/PacketContainer.h>
#include "GameConnection.h" #include "src/servers/Server_Zone/Network/GameConnection.h"
#include "src/servers/Server_Zone/Session.h"
#include "src/servers/Server_Zone/Network/PacketWrappers/ServerNoticePacket.h"
#include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket142.h"
#include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket143.h"
#include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket144.h"
#include "src/servers/Server_Zone/Network/PacketWrappers/PlayerStateFlagsPacket.h"
#include "src/servers/Server_Zone/Actor/Player.h"
#include "Session.h" #include "src/servers/Server_Zone/Forwards.h"
#include "ServerNoticePacket.h"
#include "ActorControlPacket142.h"
#include "ActorControlPacket143.h"
#include "ActorControlPacket144.h"
#include "PlayerStateFlagsPacket.h"
#include "Player.h"
#include "Forwards.h"

30
src/servers/Server_Zone/EventHandlers.cpp → src/servers/Server_Zone/Network/Handlers/EventHandlers.cpp
View file

@ -5,23 +5,19 @@
#include <boost/format.hpp> #include <boost/format.hpp>
#include "GameConnection.h" #include "src/servers/Server_Zone/Network/GameConnection.h"
#include "Session.h" #include "src/servers/Server_Zone/Session.h"
#include "src/servers/Server_Zone/Network/PacketWrappers/ServerNoticePacket.h"
#include "ServerNoticePacket.h" #include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket142.h"
#include "ActorControlPacket142.h" #include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket143.h"
#include "ActorControlPacket143.h" #include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket144.h"
#include "ActorControlPacket144.h" #include "src/servers/Server_Zone/Network/PacketWrappers/EventStartPacket.h"
#include "EventStartPacket.h" #include "src/servers/Server_Zone/Network/PacketWrappers/EventFinishPacket.h"
#include "EventFinishPacket.h" #include "src/servers/Server_Zone/Network/PacketWrappers/PlayerStateFlagsPacket.h"
#include "PlayerStateFlagsPacket.h" #include "src/servers/Server_Zone/Script/ScriptManager.h"
#include "ScriptManager.h" #include "src/servers/Server_Zone/Actor/Player.h"
#include "src/servers/Server_Zone/Forwards.h"
#include "Player.h" #include "src/servers/Server_Zone/Event/EventHelper.h"
#include "Forwards.h"
#include "EventHelper.h"
extern Core::Scripting::ScriptManager g_scriptMgr; extern Core::Scripting::ScriptManager g_scriptMgr;

56
src/servers/Server_Zone/GMCommandHandlers.cpp → src/servers/Server_Zone/Network/Handlers/GMCommandHandlers.cpp
View file

@ -8,46 +8,40 @@
#include <boost/format.hpp> #include <boost/format.hpp>
#include "src/servers/Server_Zone/Network/GameConnection.h"
#include "GameConnection.h" #include "src/servers/Server_Zone/Session.h"
#include "src/servers/Server_Zone/Zone/Zone.h"
#include "src/servers/Server_Zone/Zone/ZonePosition.h"
#include "src/servers/Server_Zone/ServerZone.h"
#include "src/servers/Server_Zone/Zone/ZoneMgr.h"
#include "Session.h" #include "src/servers/Server_Zone/Network/PacketWrappers/InitUIPacket.h"
#include "Zone.h" #include "src/servers/Server_Zone/Network/PacketWrappers/PingPacket.h"
#include "ZonePosition.h" #include "src/servers/Server_Zone/Network/PacketWrappers/MoveActorPacket.h"
#include "ServerZone.h" #include "src/servers/Server_Zone/Network/PacketWrappers/ChatPacket.h"
#include "ZoneMgr.h" #include "src/servers/Server_Zone/Network/PacketWrappers/ServerNoticePacket.h"
#include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket142.h"
#include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket143.h"
#include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket144.h"
#include "src/servers/Server_Zone/Network/PacketWrappers/EventStartPacket.h"
#include "src/servers/Server_Zone/Network/PacketWrappers/EventFinishPacket.h"
#include "src/servers/Server_Zone/Network/PacketWrappers/PlayerStateFlagsPacket.h"
#include "InitUIPacket.h" #include "src/servers/Server_Zone/DebugCommand/DebugCommandHandler.h"
#include "PingPacket.h" #include "src/servers/Server_Zone/Actor/Player.h"
#include "MoveActorPacket.h" #include "src/servers/Server_Zone/Inventory/Inventory.h"
#include "ChatPacket.h" #include "src/servers/Server_Zone/Forwards.h"
#include "ServerNoticePacket.h" #include "src/servers/Server_Zone/Event/EventHelper.h"
#include "ActorControlPacket142.h" #include "src/servers/Server_Zone/Action/Action.h"
#include "ActorControlPacket143.h" #include "src/servers/Server_Zone/Action/ActionTeleport.h"
#include "ActorControlPacket144.h"
#include "EventStartPacket.h"
#include "EventFinishPacket.h"
#include "PlayerStateFlagsPacket.h"
#include "GameCommandHandler.h"
#include "Player.h"
#include "Inventory.h"
#include "Forwards.h"
#include "EventHelper.h"
#include "Action.h"
#include "ActionTeleport.h"
extern Core::Logger g_log; extern Core::Logger g_log;
extern Core::Db::Database g_database; extern Core::Db::Database g_database;
extern Core::ServerZone g_serverZone; extern Core::ServerZone g_serverZone;
extern Core::ZoneMgr g_zoneMgr; extern Core::ZoneMgr g_zoneMgr;
extern Core::Data::ExdData g_exdData; extern Core::Data::ExdData g_exdData;
extern Core::GameCommandHandler g_gameCommandMgr; extern Core::DebugCommandHandler g_gameCommandMgr;
using namespace Core::Common; using namespace Core::Common;
using namespace Core::Network::Packets; using namespace Core::Network::Packets;

46
src/servers/Server_Zone/InventoryHandler.cpp → src/servers/Server_Zone/Network/Handlers/InventoryHandler.cpp
View file

@ -8,46 +8,30 @@
#include <boost/format.hpp> #include <boost/format.hpp>
#include "src/servers/Server_Zone/Network/GameConnection.h"
#include "GameConnection.h" #include "src/servers/Server_Zone/Session.h"
#include "src/servers/Server_Zone/Zone/Zone.h"
#include "src/servers/Server_Zone/Zone/ZonePosition.h"
#include "src/servers/Server_Zone/ServerZone.h"
#include "src/servers/Server_Zone/Zone/ZoneMgr.h"
#include "Session.h" #include "src/servers/Server_Zone/Network/PacketWrappers/ServerNoticePacket.h"
#include "Zone.h" #include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket142.h"
#include "ZonePosition.h" #include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket143.h"
#include "ServerZone.h" #include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket144.h"
#include "ZoneMgr.h"
#include "InitUIPacket.h" #include "src/servers/Server_Zone/DebugCommand/DebugCommandHandler.h"
#include "PingPacket.h" #include "src/servers/Server_Zone/Actor/Player.h"
#include "MoveActorPacket.h" #include "src/servers/Server_Zone/Inventory/Inventory.h"
#include "ChatPacket.h" #include "src/servers/Server_Zone/Forwards.h"
#include "ServerNoticePacket.h"
#include "ActorControlPacket142.h"
#include "ActorControlPacket143.h"
#include "ActorControlPacket144.h"
#include "EventStartPacket.h"
#include "EventFinishPacket.h"
#include "PlayerStateFlagsPacket.h"
#include "GameCommandHandler.h"
#include "Player.h"
#include "Inventory.h"
#include "Forwards.h"
#include "EventHelper.h"
#include "Action.h"
#include "ActionTeleport.h"
extern Core::Logger g_log; extern Core::Logger g_log;
extern Core::Db::Database g_database; extern Core::Db::Database g_database;
extern Core::ServerZone g_serverZone; extern Core::ServerZone g_serverZone;
extern Core::ZoneMgr g_zoneMgr; extern Core::ZoneMgr g_zoneMgr;
extern Core::Data::ExdData g_exdData; extern Core::Data::ExdData g_exdData;
extern Core::GameCommandHandler g_gameCommandMgr; extern Core::DebugCommandHandler g_gameCommandMgr;
using namespace Core::Common; using namespace Core::Common;
using namespace Core::Network::Packets; using namespace Core::Network::Packets;

55
src/servers/Server_Zone/PacketHandlers.cpp → src/servers/Server_Zone/Network/Handlers/PacketHandlers.cpp
View file

@ -9,45 +9,40 @@
#include <boost/format.hpp> #include <boost/format.hpp>
#include "GameConnection.h" #include "src/servers/Server_Zone/Network/GameConnection.h"
#include "Session.h" #include "src/servers/Server_Zone/Session.h"
#include "Zone.h" #include "src/servers/Server_Zone/Zone/Zone.h"
#include "ZonePosition.h" #include "src/servers/Server_Zone/Zone/ZonePosition.h"
#include "ServerZone.h" #include "src/servers/Server_Zone/ServerZone.h"
#include "ZoneMgr.h" #include "src/servers/Server_Zone/Zone/ZoneMgr.h"
#include "InitUIPacket.h" #include "src/servers/Server_Zone/Network/PacketWrappers/InitUIPacket.h"
#include "PingPacket.h" #include "src/servers/Server_Zone/Network/PacketWrappers/PingPacket.h"
#include "MoveActorPacket.h" #include "src/servers/Server_Zone/Network/PacketWrappers/MoveActorPacket.h"
#include "ChatPacket.h" #include "src/servers/Server_Zone/Network/PacketWrappers/ChatPacket.h"
#include "ServerNoticePacket.h" #include "src/servers/Server_Zone/Network/PacketWrappers/ServerNoticePacket.h"
#include "ActorControlPacket142.h" #include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket142.h"
#include "ActorControlPacket143.h" #include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket143.h"
#include "ActorControlPacket144.h" #include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket144.h"
#include "EventStartPacket.h" #include "src/servers/Server_Zone/Network/PacketWrappers/EventStartPacket.h"
#include "EventFinishPacket.h" #include "src/servers/Server_Zone/Network/PacketWrappers/EventFinishPacket.h"
#include "PlayerStateFlagsPacket.h" #include "src/servers/Server_Zone/Network/PacketWrappers/PlayerStateFlagsPacket.h"
#include "src/servers/Server_Zone/DebugCommand/DebugCommandHandler.h"
#include "GameCommandHandler.h" #include "src/servers/Server_Zone/Actor/Player.h"
#include "src/servers/Server_Zone/Inventory/Inventory.h"
#include "Player.h" #include "src/servers/Server_Zone/Forwards.h"
#include "Inventory.h" #include "src/servers/Server_Zone/Event/EventHelper.h"
#include "src/servers/Server_Zone/Action/Action.h"
#include "Forwards.h" #include "src/servers/Server_Zone/Action/ActionTeleport.h"
#include "EventHelper.h"
#include "Action.h"
#include "ActionTeleport.h"
extern Core::Logger g_log; extern Core::Logger g_log;
extern Core::Db::Database g_database; extern Core::Db::Database g_database;
extern Core::ServerZone g_serverZone; extern Core::ServerZone g_serverZone;
extern Core::ZoneMgr g_zoneMgr; extern Core::ZoneMgr g_zoneMgr;
extern Core::Data::ExdData g_exdData; extern Core::Data::ExdData g_exdData;
extern Core::GameCommandHandler g_gameCommandMgr; extern Core::DebugCommandHandler g_gameCommandMgr;
using namespace Core::Common; using namespace Core::Common;
using namespace Core::Network::Packets; using namespace Core::Network::Packets;

28
src/servers/Server_Zone/SkillHandler.cpp → src/servers/Server_Zone/Network/Handlers/SkillHandler.cpp
View file

@ -7,27 +7,27 @@
#include <boost/format.hpp> #include <boost/format.hpp>
#include "GameConnection.h" #include "src/servers/Server_Zone/Network/GameConnection.h"
#include "Session.h" #include "src/servers/Server_Zone/Session.h"
#include "ServerNoticePacket.h" #include "src/servers/Server_Zone/Network/PacketWrappers/ServerNoticePacket.h"
#include "ActorControlPacket142.h" #include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket142.h"
#include "ActorControlPacket143.h" #include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket143.h"
#include "ActorControlPacket144.h" #include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket144.h"
#include "PlayerStateFlagsPacket.h" #include "src/servers/Server_Zone/Network/PacketWrappers/PlayerStateFlagsPacket.h"
#include "GameCommandHandler.h" #include "src/servers/Server_Zone/DebugCommand/DebugCommandHandler.h"
#include "Player.h" #include "src/servers/Server_Zone/Actor/Player.h"
#include "Forwards.h" #include "src/servers/Server_Zone/Forwards.h"
#include "Action.h" #include "src/servers/Server_Zone/Action/Action.h"
#include "ActionTeleport.h" #include "src/servers/Server_Zone/Action/ActionTeleport.h"
#include "ActionCast.h" #include "src/servers/Server_Zone/Action/ActionCast.h"
#include "ScriptManager.h" #include "src/servers/Server_Zone/Script/ScriptManager.h"
extern Core::Scripting::ScriptManager g_scriptMgr; extern Core::Scripting::ScriptManager g_scriptMgr;

2
src/servers/Server_Zone/ActorControlPacket142.h → src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket142.h
View file

@ -3,7 +3,7 @@
#include <Server_Common/GamePacketNew.h> #include <Server_Common/GamePacketNew.h>
#include <Server_Common/ServerPacketDef.h> #include <Server_Common/ServerPacketDef.h>
#include "Forwards.h" #include "src/servers/Server_Zone/Forwards.h"
namespace Core { namespace Core {
namespace Network { namespace Network {

2
src/servers/Server_Zone/ActorControlPacket143.h → src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket143.h
View file

@ -3,7 +3,7 @@
#include <Server_Common/GamePacketNew.h> #include <Server_Common/GamePacketNew.h>
#include <Server_Common/ServerPacketDef.h> #include <Server_Common/ServerPacketDef.h>
#include "Forwards.h" #include "src/servers/Server_Zone/Forwards.h"
namespace Core { namespace Core {

0
src/servers/Server_Zone/ActorControlPacket144.h → src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket144.h
View file

6
src/servers/Server_Zone/ActorSpawnPacket.h → src/servers/Server_Zone/Network/PacketWrappers/ActorSpawnPacket.h
View file

@ -3,8 +3,8 @@
#include <Server_Common/GamePacketNew.h> #include <Server_Common/GamePacketNew.h>
#include <Server_Common/UtilMath.h> #include <Server_Common/UtilMath.h>
#include "Player.h" #include "src/servers/Server_Zone/Actor/Player.h"
#include "Forwards.h" #include "src/servers/Server_Zone/Forwards.h"
namespace Core { namespace Core {
namespace Network { namespace Network {
@ -12,7 +12,7 @@ namespace Packets {
namespace Server { namespace Server {
/** /**
* @brief The packet sent to finish an event. * @brief The packet sent to spawn an actor.
*/ */
class ActorSpawnPacket : class ActorSpawnPacket :
public GamePacketNew<FFXIVIpcActorSpawn> public GamePacketNew<FFXIVIpcActorSpawn>

2
src/servers/Server_Zone/ChatPacket.h → src/servers/Server_Zone/Network/PacketWrappers/ChatPacket.h
View file

@ -3,7 +3,7 @@
#include <Server_Common/GamePacketNew.h> #include <Server_Common/GamePacketNew.h>
#include <Server_Common/ServerPacketDef.h> #include <Server_Common/ServerPacketDef.h>
#include "Forwards.h" #include "src/servers/Server_Zone/Forwards.h"
namespace Core { namespace Core {

0
src/servers/Server_Zone/EventFinishPacket.h → src/servers/Server_Zone/Network/PacketWrappers/EventFinishPacket.h
View file

2
src/servers/Server_Zone/EventPlayPacket.h → src/servers/Server_Zone/Network/PacketWrappers/EventPlayPacket.h
View file

@ -2,7 +2,7 @@
#define _EVENTPLAY_H #define _EVENTPLAY_H
#include <Server_Common/GamePacketNew.h> #include <Server_Common/GamePacketNew.h>
#include "Forwards.h" #include "src/servers/Server_Zone/Forwards.h"
namespace Core { namespace Core {
namespace Network { namespace Network {

2
src/servers/Server_Zone/EventStartPacket.h → src/servers/Server_Zone/Network/PacketWrappers/EventStartPacket.h
View file

@ -2,7 +2,7 @@
#define _EVENTSTART_H #define _EVENTSTART_H
#include <Server_Common/GamePacketNew.h> #include <Server_Common/GamePacketNew.h>
#include "Forwards.h" #include "src/servers/Server_Zone/Forwards.h"
namespace Core { namespace Core {
namespace Network { namespace Network {

4
src/servers/Server_Zone/InitUIPacket.h → src/servers/Server_Zone/Network/PacketWrappers/InitUIPacket.h
View file

@ -3,8 +3,8 @@
#include <Server_Common/GamePacketNew.h> #include <Server_Common/GamePacketNew.h>
#include <Server_Common/ServerPacketDef.h> #include <Server_Common/ServerPacketDef.h>
#include "Player.h" #include "Server_Zone/Actor/Player.h"
#include "Forwards.h" #include "Server_Zone/Forwards.h"
namespace Core { namespace Core {
namespace Network { namespace Network {

4
src/servers/Server_Zone/ModelEquipPacket.h → src/servers/Server_Zone/Network/PacketWrappers/ModelEquipPacket.h
View file

@ -2,8 +2,8 @@
#define _MODELEQUIPPACKET_H #define _MODELEQUIPPACKET_H
#include <Server_Common/GamePacketNew.h> #include <Server_Common/GamePacketNew.h>
#include "Player.h" #include "src/servers/Server_Zone/Actor/Player.h"
#include "Forwards.h" #include "src/servers/Server_Zone/Forwards.h"
namespace Core { namespace Core {
namespace Network { namespace Network {

4
src/servers/Server_Zone/MoveActorPacket.h → src/servers/Server_Zone/Network/PacketWrappers/MoveActorPacket.h
View file

@ -4,8 +4,8 @@
#include <Server_Common/GamePacketNew.h> #include <Server_Common/GamePacketNew.h>
#include <Server_Common/ServerPacketDef.h> #include <Server_Common/ServerPacketDef.h>
#include <Server_Common/UtilMath.h> #include <Server_Common/UtilMath.h>
#include "Player.h" #include "src/servers/Server_Zone/Actor/Player.h"
#include "Forwards.h" #include "src/servers/Server_Zone/Forwards.h"
namespace Core { namespace Core {

2
src/servers/Server_Zone/PingPacket.h → src/servers/Server_Zone/Network/PacketWrappers/PingPacket.h
View file

@ -3,7 +3,7 @@
#include <Server_Common/GamePacketNew.h> #include <Server_Common/GamePacketNew.h>
#include "Forwards.h" #include "src/servers/Server_Zone/Forwards.h"
namespace Core { namespace Core {
namespace Network { namespace Network {

105
src/servers/Server_Zone/Network/PacketWrappers/PlayerSpawnPacket.h Normal file
View file

@ -0,0 +1,105 @@
#ifndef _PLAYERSPAWN_H
#define _PLAYERSPAWN_H
#include <Server_Common/ServerPacketDef.h>
#include <Server_Common/GamePacketNew.h>
#include <Server_Common/UtilMath.h>
#include "src/servers/Server_Zone/Actor/Player.h"
#include "src/servers/Server_Zone/Forwards.h"
#include "src/servers/Server_Zone/Inventory/Inventory.h"
#include "src/servers/Server_Zone/Inventory/Item.h"
namespace Core {
namespace Network {
namespace Packets {
namespace Server {
/**
* @brief The packet sent to spawn a player.
*/
class PlayerSpawnPacket :
public GamePacketNew<FFXIVIpcPlayerSpawn>
{
public:
PlayerSpawnPacket( Entity::PlayerPtr pPlayer, Entity::PlayerPtr pTarget ) :
GamePacketNew<FFXIVIpcPlayerSpawn>( pPlayer->getId(), pTarget->getId() )
{
initialize( pPlayer, pTarget );
};
private:
void initialize( Entity::PlayerPtr pPlayer, Entity::PlayerPtr pTarget )
{
// todo: figure out unkown offsets
// TODO: temporary gm rank
//m_data.gmRank = 0xff;
m_data.currentMount = 0;
m_data.classJob = pPlayer->getClass();
//m_data.status = static_cast< uint8_t >( pPlayer->getStatus() );
m_data.hPCurr = pPlayer->getHp();
m_data.mPCurr = pPlayer->getMp();
m_data.tPCurr = pPlayer->getTp();
m_data.hPMax = pPlayer->getMaxHp();
m_data.mPMax = pPlayer->getMaxMp();
m_data.gmRank = 0xff;
//m_data.tPMax = 3000;
m_data.level = pPlayer->getLevel();
memcpy( m_data.look, pPlayer->getLookArray(), 26 );
auto item = pPlayer->getInvetory()->getItemAt( Inventory::GearSet0, 0 );
if( item )
m_data.mainWeaponModel = item->getModelId1();
m_data.secWeaponModel = pPlayer->getModelSubWeapon();
m_data.models[0] = pPlayer->getModelForSlot( Inventory::EquipSlot::Head );
m_data.models[1] = pPlayer->getModelForSlot( Inventory::EquipSlot::Body );
m_data.models[2] = pPlayer->getModelForSlot( Inventory::EquipSlot::Hands );
m_data.models[3] = pPlayer->getModelForSlot( Inventory::EquipSlot::Legs );
m_data.models[4] = pPlayer->getModelForSlot( Inventory::EquipSlot::Feet );
strcpy( m_data.name, pPlayer->getName().c_str() );
m_data.pos.x = pPlayer->getPos().x;
m_data.pos.y = pPlayer->getPos().y;
m_data.pos.z = pPlayer->getPos().z;
m_data.voice = pPlayer->getVoiceId();
m_data.rotation = Math::Util::floatToUInt16Rot( pPlayer->getRotation() );
m_data.onlineStatus = static_cast< uint8_t >( pPlayer->getOnlineStatus() );
//m_data.u23 = 0x04;
//m_data.u24 = 256;
m_data.state = 1;
m_data.type = 1;
if( pTarget == pPlayer )
{
m_data.spawnIndex = 0x00;
}
else
{
m_data.spawnIndex = pTarget->getSpawnIdForActorId( pPlayer->getId() );
}
// 0x20 == spawn hidden to be displayed by the spawneffect control
m_data.displayFlags = pPlayer->getStance();
if( pPlayer->getZoningType() != Common::ZoneingType::None )
{
m_data.displayFlags |= 0x20;
}
m_data.targetId = pPlayer->getTargetId();
//m_data.type = 1;
//m_data.unknown_33 = 4;
//m_data.unknown_38 = 0x70;
//m_data.unknown_60 = 3;
//m_data.unknown_61 = 7;
};
};
}
}
}
}
#endif /*_PlayerSpawn_H*/

6
src/servers/Server_Zone/PlayerStateFlagsPacket.h → src/servers/Server_Zone/Network/PacketWrappers/PlayerStateFlagsPacket.h
View file

@ -2,8 +2,8 @@
#define _PLAYERSTATE_H #define _PLAYERSTATE_H
#include <Server_Common/GamePacketNew.h> #include <Server_Common/GamePacketNew.h>
#include "Player.h" #include "src/servers/Server_Zone/Actor/Player.h"
#include "Forwards.h" #include "src/servers/Server_Zone/Forwards.h"
namespace Core { namespace Core {
namespace Network { namespace Network {
@ -11,7 +11,7 @@ namespace Packets {
namespace Server { namespace Server {
/** /**
* @brief The Ping response packet. * @brief Packet sent to set a players state, this impacts which actions he can perform.
*/ */
class PlayerStateFlagsPacket : class PlayerStateFlagsPacket :
public GamePacketNew< FFXIVIpcPlayerStateFlags > public GamePacketNew< FFXIVIpcPlayerStateFlags >

9
src/servers/Server_Zone/QuestMessagePacket.h → src/servers/Server_Zone/Network/PacketWrappers/QuestMessagePacket.h
View file

@ -2,8 +2,8 @@
#define _QUESTMESSAGE_H #define _QUESTMESSAGE_H
#include <Server_Common/GamePacketNew.h> #include <Server_Common/GamePacketNew.h>
#include "Player.h" #include "src/servers/Server_Zone/Actor/Player.h"
#include "Forwards.h" #include "src/servers/Server_Zone/Forwards.h"
namespace Core { namespace Core {
namespace Network { namespace Network {
@ -11,13 +11,14 @@ namespace Packets {
namespace Server { namespace Server {
/** /**
* @brief The Ping response packet. * @brief Packet to display a quest specific info message.
*/ */
class QuestMessagePacket : class QuestMessagePacket :
public GamePacketNew< FFXIVIpcQuestMessage > public GamePacketNew< FFXIVIpcQuestMessage >
{ {
public: public:
QuestMessagePacket( Entity::ActorPtr pActor, uint32_t questId, int8_t msgId, uint8_t type = 0, uint32_t var1 = 0, uint32_t var2 = 0 ) : QuestMessagePacket( Entity::ActorPtr pActor, uint32_t questId, int8_t msgId,
uint8_t type = 0, uint32_t var1 = 0, uint32_t var2 = 0 ) :
GamePacketNew< FFXIVIpcQuestMessage >( pActor->getId(), pActor->getId() ) GamePacketNew< FFXIVIpcQuestMessage >( pActor->getId(), pActor->getId() )
{ {
initialize( questId, msgId, type, var1, var2 ); initialize( questId, msgId, type, var1, var2 );

2
src/servers/Server_Zone/ServerNoticePacket.h → src/servers/Server_Zone/Network/PacketWrappers/ServerNoticePacket.h
View file

@ -3,7 +3,7 @@
#include <Server_Common/GamePacketNew.h> #include <Server_Common/GamePacketNew.h>
#include <Server_Common/ServerPacketDef.h> #include <Server_Common/ServerPacketDef.h>
#include "Forwards.h" #include "src/servers/Server_Zone/Forwards.h"
namespace Core { namespace Core {
namespace Network { namespace Network {

2
src/servers/Server_Zone/UpdateHpMpTpPacket.h → src/servers/Server_Zone/Network/PacketWrappers/UpdateHpMpTpPacket.h
View file

@ -2,7 +2,7 @@
#define _UPDATEHPMPTP_H #define _UPDATEHPMPTP_H
#include <Server_Common/GamePacketNew.h> #include <Server_Common/GamePacketNew.h>
#include "Forwards.h" #include "src/servers/Server_Zone/Forwards.h"
namespace Core { namespace Core {
namespace Network { namespace Network {

105
src/servers/Server_Zone/PlayerSpawnPacket.h
View file

@ -1,105 +0,0 @@
#ifndef _PLAYERSPAWN_H
#define _PLAYERSPAWN_H
#include <Server_Common/ServerPacketDef.h>
#include <Server_Common/GamePacketNew.h>
#include <Server_Common/UtilMath.h>
#include "Player.h"
#include "Forwards.h"
#include "Inventory.h"
#include "Item.h"
namespace Core {
namespace Network {
namespace Packets {
namespace Server {
/**
* @brief The packet sent to finish an event.
*/
class PlayerSpawnPacket :
public GamePacketNew<FFXIVIpcPlayerSpawn>
{
public:
PlayerSpawnPacket( Entity::PlayerPtr pPlayer, Entity::PlayerPtr pTarget ) :
GamePacketNew<FFXIVIpcPlayerSpawn>( pPlayer->getId(), pTarget->getId() )
{
initialize( pPlayer, pTarget );
};
private:
void initialize( Entity::PlayerPtr pPlayer, Entity::PlayerPtr pTarget )
{
// todo: figure out unkown offsets
// TODO: temporary gm rank
//m_data.gmRank = 0xff;
m_data.currentMount = 0;
m_data.classJob = pPlayer->getClass();
//m_data.status = static_cast< uint8_t >( pPlayer->getStatus() );
m_data.hPCurr = pPlayer->getHp();
m_data.mPCurr = pPlayer->getMp();
m_data.tPCurr = pPlayer->getTp();
m_data.hPMax = pPlayer->getMaxHp();
m_data.mPMax = pPlayer->getMaxMp();
m_data.gmRank = 0xff;
//m_data.tPMax = 3000;
m_data.level = pPlayer->getLevel();
memcpy( m_data.look, pPlayer->getLookArray(), 26 );
auto item = pPlayer->getInvetory()->getItemAt( Inventory::GearSet0, 0 );
if( item )
m_data.mainWeaponModel = item->getModelId1();
m_data.secWeaponModel = pPlayer->getModelSubWeapon();
m_data.models[0] = pPlayer->getModelForSlot( Inventory::EquipSlot::Head );
m_data.models[1] = pPlayer->getModelForSlot( Inventory::EquipSlot::Body );
m_data.models[2] = pPlayer->getModelForSlot( Inventory::EquipSlot::Hands );
m_data.models[3] = pPlayer->getModelForSlot( Inventory::EquipSlot::Legs );
m_data.models[4] = pPlayer->getModelForSlot( Inventory::EquipSlot::Feet );
strcpy( m_data.name, pPlayer->getName().c_str() );
m_data.pos.x = pPlayer->getPos().x;
m_data.pos.y = pPlayer->getPos().y;
m_data.pos.z = pPlayer->getPos().z;
m_data.voice = pPlayer->getVoiceId();
m_data.rotation = Math::Util::floatToUInt16Rot( pPlayer->getRotation() );
m_data.onlineStatus = static_cast< uint8_t >( pPlayer->getOnlineStatus() );
//m_data.u23 = 0x04;
//m_data.u24 = 256;
m_data.state = 1;
m_data.type = 1;
if( pTarget == pPlayer )
{
m_data.spawnIndex = 0x00;
}
else
{
m_data.spawnIndex = pTarget->getSpawnIdForActorId( pPlayer->getId() );
}
// 0x20 == spawn hidden to be displayed by the spawneffect control
m_data.displayFlags = pPlayer->getStance();
if( pPlayer->getZoningType() != Common::ZoneingType::None )
{
m_data.displayFlags |= 0x20;
}
m_data.targetId = pPlayer->getTargetId();
//m_data.type = 1;
//m_data.unknown_33 = 4;
//m_data.unknown_38 = 0x70;
//m_data.unknown_60 = 3;
//m_data.unknown_61 = 7;
};
};
}
}
}
}
#endif /*_PlayerSpawn_H*/

20
src/servers/Server_Zone/ScriptManager.cpp → src/servers/Server_Zone/Script/ScriptManager.cpp
View file

@ -3,18 +3,16 @@
#include <chaiscript/chaiscript.hpp> #include <chaiscript/chaiscript.hpp>
#include <Server_Common/ChaiscriptStdLib.h> #include <Server_Common/ChaiscriptStdLib.h>
#include "ScriptManager.h"
#include "Zone.h" #include "src/servers/Server_Zone/Zone/Zone.h"
#include "Player.h" #include "src/servers/Server_Zone/Actor/Player.h"
#include "BattleNpc.h" #include "src/servers/Server_Zone/Actor/BattleNpc.h"
#include "ServerZone.h" #include "src/servers/Server_Zone/ServerZone.h"
#include "Event.h" #include "src/servers/Server_Zone/Event/Event.h"
#include "EventHelper.h" #include "src/servers/Server_Zone/Event/EventHelper.h"
#include "ScriptManager.h" #include "src/servers/Server_Zone/StatusEffect/StatusEffect.h"
#include "StatusEffect.h" #include "src/servers/Server_Zone/Network/PacketWrappers/ServerNoticePacket.h"
#include "src/servers/Server_Zone/Script/ScriptManager.h"
#include "ServerNoticePacket.h"
#include <boost/lexical_cast.hpp> #include <boost/lexical_cast.hpp>
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>

2
src/servers/Server_Zone/ScriptManager.h → src/servers/Server_Zone/Script/ScriptManager.h
View file

@ -6,7 +6,7 @@
#include <set> #include <set>
#include <Server_Common/Common.h> #include <Server_Common/Common.h>
#include "Forwards.h" #include "../Forwards.h"
namespace chaiscript namespace chaiscript

17
src/servers/Server_Zone/ScriptManagerInit.cpp → src/servers/Server_Zone/Script/ScriptManagerInit.cpp
View file

@ -2,16 +2,17 @@
#include <chaiscript/chaiscript.hpp> #include <chaiscript/chaiscript.hpp>
#include <Server_Common/ChaiscriptStdLib.h> #include <Server_Common/ChaiscriptStdLib.h>
#include "ScriptManager.h"
#include "Zone.h" #include "src/servers/Server_Zone/Script/ScriptManager.h"
#include "Player.h"
#include "BattleNpc.h"
#include "Event.h"
#include "EventHelper.h"
#include "ServerNoticePacket.h" #include "src/servers/Server_Zone/Zone/Zone.h"
#include "StatusEffect.h" #include "src/servers/Server_Zone/Actor/Player.h"
#include "src/servers/Server_Zone/Actor/BattleNpc.h"
#include "src/servers/Server_Zone/Event/Event.h"
#include "src/servers/Server_Zone/Event/EventHelper.h"
#include "src/servers/Server_Zone/Network/PacketWrappers/ServerNoticePacket.h"
#include "src/servers/Server_Zone/StatusEffect/StatusEffect.h"
#include <boost/lexical_cast.hpp> #include <boost/lexical_cast.hpp>
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>

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

@ -15,14 +15,14 @@
#include <Server_Common/ExdData.h> #include <Server_Common/ExdData.h>
#include <Server_Common/PacketContainer.h> #include <Server_Common/PacketContainer.h>
#include "GameConnection.h" #include "src/servers/Server_Zone/Network/GameConnection.h"
#include "Session.h" #include "Session.h"
#include "ZoneMgr.h" #include "src/servers/Server_Zone/Zone/ZoneMgr.h"
#include "GameCommandHandler.h" #include "src/servers/Server_Zone/DebugCommand/DebugCommandHandler.h"
#include "ScriptManager.h" #include "Script/ScriptManager.h"
#include "Forwards.h" #include "Forwards.h"
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
@ -32,7 +32,7 @@
Core::Logger g_log; Core::Logger g_log;
Core::Db::Database g_database; Core::Db::Database g_database;
Core::GameCommandHandler g_gameCommandMgr; Core::DebugCommandHandler g_gameCommandMgr;
Core::Scripting::ScriptManager g_scriptMgr; Core::Scripting::ScriptManager g_scriptMgr;
Core::Data::ExdData g_exdData; Core::Data::ExdData g_exdData;
Core::ZoneMgr g_zoneMgr; Core::ZoneMgr g_zoneMgr;

2
src/servers/Server_Zone/ServerZone.h
View file

@ -8,7 +8,7 @@
#include <map> #include <map>
#include "Forwards.h" #include "Forwards.h"
#include "BattleNpcTemplate.h" #include "src/servers/Server_Zone/Actor/BattleNpcTemplate.h"
namespace Core { namespace Core {

4
src/servers/Server_Zone/Session.cpp
View file

@ -2,10 +2,10 @@
#include <Server_Common/Util.h> #include <Server_Common/Util.h>
#include <Server_Common/PacketContainer.h> #include <Server_Common/PacketContainer.h>
#include "GameConnection.h" #include "src/servers/Server_Zone/Network/GameConnection.h"
#include "Session.h" #include "Session.h"
#include "Player.h" #include "src/servers/Server_Zone/Actor/Player.h"
Core::Session::Session( uint32_t sessionId ) Core::Session::Session( uint32_t sessionId )
: m_sessionId( sessionId ) : m_sessionId( sessionId )

4
src/servers/Server_Zone/StatusEffect.cpp → src/servers/Server_Zone/StatusEffect/StatusEffect.cpp
View file

@ -7,10 +7,10 @@
#include <boost/algorithm/string.hpp> #include <boost/algorithm/string.hpp>
#include <algorithm> #include <algorithm>
#include "Actor.h" #include "src/servers/Server_Zone/Actor/Actor.h"
#include "StatusEffect.h" #include "StatusEffect.h"
#include "ScriptManager.h" #include "src/servers/Server_Zone/Script/ScriptManager.h"
extern Core::Logger g_log; extern Core::Logger g_log;
extern Core::Data::ExdData g_exdData; extern Core::Data::ExdData g_exdData;

2
src/servers/Server_Zone/StatusEffect.h → src/servers/Server_Zone/StatusEffect/StatusEffect.h
View file

@ -3,7 +3,7 @@
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#include "Forwards.h" #include "src/servers/Server_Zone/Forwards.h"
namespace Core namespace Core
{ {

6
src/servers/Server_Zone/StatusEffectContainer.cpp → src/servers/Server_Zone/StatusEffect/StatusEffectContainer.cpp
View file

@ -1,11 +1,11 @@
#include <Server_Common/Util.h> #include <Server_Common/Util.h>
#include <Server_Common/ServerPacketDef.h> #include <Server_Common/ServerPacketDef.h>
#include "Actor.h" #include "src/servers/Server_Zone/Actor/Actor.h"
#include "StatusEffect.h" #include "StatusEffect.h"
#include "StatusEffectContainer.h" #include "StatusEffectContainer.h"
#include "ActorControlPacket142.h" #include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket142.h"
#include "ActorControlPacket143.h" #include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket143.h"
using namespace Core::Common; using namespace Core::Common;

2
src/servers/Server_Zone/StatusEffectContainer.h → src/servers/Server_Zone/StatusEffect/StatusEffectContainer.h
View file

@ -6,7 +6,7 @@
#include <queue> #include <queue>
#include <map> #include <map>
#include "Forwards.h" #include "src/servers/Server_Zone/Forwards.h"
namespace Core namespace Core
{ {

7
src/servers/Server_Zone/Cell.cpp → src/servers/Server_Zone/Zone/Cell.cpp
View file

@ -1,10 +1,11 @@
#include "Cell.h" #include "Cell.h"
#include "Actor.h" #include "src/servers/Server_Zone/Actor/Actor.h"
#include "Forwards.h" #include "src/servers/Server_Zone/Actor/BattleNpc.h"
#include "src/servers/Server_Zone/Forwards.h"
#include "Zone.h" #include "Zone.h"
#include "BattleNpc.h"
// TODO: the entire zone / areahandling is a bit outdated ( in parts i used this for the 1.0 iteration ) // TODO: the entire zone / areahandling is a bit outdated ( in parts i used this for the 1.0 iteration )
// likely this could be greatly improved or redone // likely this could be greatly improved or redone

2
src/servers/Server_Zone/Cell.h → src/servers/Server_Zone/Zone/Cell.h
View file

@ -4,7 +4,7 @@
#include <stdint.h> #include <stdint.h>
#include "Forwards.h" #include "src/servers/Server_Zone/Forwards.h"
#include <set> #include <set>
namespace Core { namespace Core {

0
src/servers/Server_Zone/CellHandler.h → src/servers/Server_Zone/Zone/CellHandler.h
View file

22
src/servers/Server_Zone/Zone.cpp → src/servers/Server_Zone/Zone/Zone.cpp
View file

@ -13,19 +13,19 @@
#include <Server_Common/ServerPacketDef.h> #include <Server_Common/ServerPacketDef.h>
#include <Server_Common/PacketContainer.h> #include <Server_Common/PacketContainer.h>
#include "Session.h"
#include "Actor.h"
#include "Player.h"
#include "BattleNpc.h"
#include "Forwards.h"
#include "GameConnection.h"
#include "Zone.h" #include "Zone.h"
#include "ZoneMgr.h" #include "ZoneMgr.h"
#include "ServerZone.h"
#include "ScriptManager.h" #include "src/servers/Server_Zone/Session.h"
#include "src/servers/Server_Zone/Actor/Actor.h"
#include "src/servers/Server_Zone/Actor/Player.h"
#include "src/servers/Server_Zone/Actor/BattleNpc.h"
#include "src/servers/Server_Zone/Forwards.h"
#include "src/servers/Server_Zone/Network/GameConnection.h"
#include "src/servers/Server_Zone/ServerZone.h"
#include "src/servers/Server_Zone/Script/ScriptManager.h"
#include "CellHandler.h" #include "CellHandler.h"

2
src/servers/Server_Zone/Zone.h → src/servers/Server_Zone/Zone/Zone.h
View file

@ -7,7 +7,7 @@
#include "Cell.h" #include "Cell.h"
#include "CellHandler.h" #include "CellHandler.h"
#include "Forwards.h" #include "src/servers/Server_Zone/Forwards.h"
#include <set> #include <set>
#include <boost/enable_shared_from_this.hpp> #include <boost/enable_shared_from_this.hpp>

0
src/servers/Server_Zone/ZoneMgr.cpp → src/servers/Server_Zone/Zone/ZoneMgr.cpp
View file

2
src/servers/Server_Zone/ZoneMgr.h → src/servers/Server_Zone/Zone/ZoneMgr.h
View file

@ -4,7 +4,7 @@
#include <unordered_map> #include <unordered_map>
#include <map> #include <map>
#include "Forwards.h" #include "src/servers/Server_Zone/Forwards.h"
namespace Core { namespace Core {

0
src/servers/Server_Zone/ZonePosition.cpp → src/servers/Server_Zone/Zone/ZonePosition.cpp
View file

0
src/servers/Server_Zone/ZonePosition.h → src/servers/Server_Zone/Zone/ZonePosition.h
View file