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

Properly use new classes... at least let this compile

Browse source
This commit is contained in:
Mordred 2018-08-29 22:03:10 +02:00
parent 51a292415e
commit 89dbbab066
5 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/servers/sapphire_zone/Actor/BNpc.cpp
View file

@ -24,6 +24,7 @@
#include "Math/CalcBattle.h" #include "Math/CalcBattle.h"
#include "Chara.h" #include "Chara.h"
#include "Player.h" #include "Player.h"
#include "BNpc.h"
#include "Zone/TerritoryMgr.h" #include "Zone/TerritoryMgr.h"
#include "Framework.h" #include "Framework.h"
#include "Common.h" #include "Common.h"
@ -35,9 +36,8 @@ using namespace Core::Network::Packets;
using namespace Core::Network::Packets::Server; using namespace Core::Network::Packets::Server;
using namespace Core::Network::ActorControl; using namespace Core::Network::ActorControl;
Core::Entity::BNpc::BNpc( ObjKind type ) : Core::Entity::BNpc::BNpc() :
Npc( ObjKind::BattleNpc ), Npc( ObjKind::BattleNpc )
m_targetId( INVALID_GAME_OBJECT_ID )
{ {
} }

5
src/servers/sapphire_zone/Actor/BNpc.h
View file

@ -6,6 +6,7 @@
#include "Forwards.h" #include "Forwards.h"
#include "Chara.h" #include "Chara.h"
#include "Npc.h"
#include <set> #include <set>
#include <map> #include <map>
#include <queue> #include <queue>
@ -14,8 +15,8 @@ namespace Core {
namespace Entity { namespace Entity {
/*! /*!
\class Npc \class BNpc
\brief Base class for all Npcs \brief Base class for all BNpcs
*/ */
class BNpc : class BNpc :

4
src/servers/sapphire_zone/Actor/Npc.cpp
View file

@ -24,6 +24,7 @@
#include "Math/CalcBattle.h" #include "Math/CalcBattle.h"
#include "Chara.h" #include "Chara.h"
#include "Player.h" #include "Player.h"
#include "Npc.h"
#include "Zone/TerritoryMgr.h" #include "Zone/TerritoryMgr.h"
#include "Framework.h" #include "Framework.h"
#include "Common.h" #include "Common.h"
@ -36,8 +37,7 @@ using namespace Core::Network::Packets::Server;
using namespace Core::Network::ActorControl; using namespace Core::Network::ActorControl;
Core::Entity::Npc::Npc( ObjKind type ) : Core::Entity::Npc::Npc( ObjKind type ) :
Chara( type ), Chara( type )
m_targetId( INVALID_GAME_OBJECT_ID )
{ {
} }

2
src/servers/sapphire_zone/Actor/Npc.h
View file

@ -23,7 +23,7 @@ class Npc :
{ {
public: public:
Npc( ObjKind type ); Npc( Common::ObjKind type );
virtual ~Npc() override; virtual ~Npc() override;

2
src/servers/sapphire_zone/Network/PacketWrappers/EffectPacket.h
View file

@ -15,7 +15,7 @@ class EffectPacket :
{ {
public: public:
EffectPacket( uint64_t sourceId, uint32_t targetId, uint32_t actionId ) : EffectPacket( uint64_t sourceId, uint32_t targetId, uint32_t actionId ) :
ZoneChannelPacket< FFXIVIpcEffect >( sourceId, targetId ) ZoneChannelPacket< FFXIVIpcEffect >( static_cast< uint32_t >( sourceId ), targetId )
{ {
m_data.header.actionId = actionId; m_data.header.actionId = actionId;
m_data.header.actionAnimationId = static_cast< uint16_t >( actionId ); m_data.header.actionAnimationId = static_cast< uint16_t >( actionId );