From 0f995cd9348028bb4b4a2a9a78475cbc5d529c88 Mon Sep 17 00:00:00 2001 From: Alice Ogeda Date: Thu, 2 Feb 2023 02:30:31 -0300 Subject: [PATCH 1/2] chatchannel fetch by player id; general cleanup; --- .../Network/PacketDef/Chat/ServerChatDef.h | 2 +- src/common/Network/PacketDef/ServerIpcs.h | 2 +- .../Network/PacketDef/Zone/ServerZoneDef.h | 2 +- src/world/Manager/AchievementMgr.h | 2 +- src/world/Manager/ChatChannelMgr.cpp | 35 +++++++--------- src/world/Manager/ChatChannelMgr.h | 2 +- src/world/Manager/DebugCommandMgr.cpp | 2 +- .../PacketWrappers/ActorControlPacket.h | 7 +--- .../PacketWrappers/ActorControlSelfPacket.h | 7 +--- .../PacketWrappers/ActorControlTargetPacket.h | 7 +--- src/world/Network/PacketWrappers/ChatPacket.h | 7 +--- .../PacketWrappers/ChatToChannelPacket.h | 41 +++++++++++++++++++ .../Network/PacketWrappers/EffectPacket.h | 7 +--- .../PacketWrappers/EventFinishPacket.h | 7 +--- .../PacketWrappers/EventLogMessagePacket.h | 7 +--- .../Network/PacketWrappers/EventPlayPacket.h | 7 +--- .../PacketWrappers/EventResumePacket.h | 1 + .../Network/PacketWrappers/EventStartPacket.h | 6 +-- .../Network/PacketWrappers/HudParamPacket.h | 4 +- .../Network/PacketWrappers/InitZonePacket.h | 4 +- .../Network/PacketWrappers/InspectPacket.h | 8 +--- .../PacketWrappers/InviteUpdatePacket.h | 2 - .../PacketWrappers/LinkshellResultPacket.h | 2 - .../Network/PacketWrappers/ModelEquipPacket.h | 7 +--- .../Network/PacketWrappers/MoveActorPacket.h | 9 +--- .../Network/PacketWrappers/Notice2Packet.h | 7 +--- .../Network/PacketWrappers/NpcSpawnPacket.h | 7 +--- src/world/Network/PacketWrappers/PingPacket.h | 7 +--- .../PacketWrappers/PlayerSetupPacket.h | 7 +--- .../PacketWrappers/PlayerSpawnPacket.h | 7 +--- .../PacketWrappers/PlayerStateFlagsPacket.h | 1 + .../PacketWrappers/ServerNoticePacket.h | 7 +--- .../PacketWrappers/UpdateHpMpTpPacket.h | 7 +--- .../UpdateInventorySlotPacket.h | 7 +--- src/world/Territory/Territory.cpp | 3 +- 35 files changed, 107 insertions(+), 140 deletions(-) create mode 100644 src/world/Network/PacketWrappers/ChatToChannelPacket.h diff --git a/src/common/Network/PacketDef/Chat/ServerChatDef.h b/src/common/Network/PacketDef/Chat/ServerChatDef.h index f274ee29..9b1a4341 100644 --- a/src/common/Network/PacketDef/Chat/ServerChatDef.h +++ b/src/common/Network/PacketDef/Chat/ServerChatDef.h @@ -22,7 +22,7 @@ struct FFXIVChatFrom : FFXIVIpcBasePacket< ChatFrom > * Structural representation of the packet sent by the server as * message from a chat channel that the player is associated to */ -struct FFXIVChatToChannel : FFXIVIpcBasePacket< Chat > +struct FFXIVChatToChannel : FFXIVIpcBasePacket< ChatToChannel > { uint64_t channelID; uint64_t speakerCharacterID; diff --git a/src/common/Network/PacketDef/ServerIpcs.h b/src/common/Network/PacketDef/ServerIpcs.h index fa766e09..87af482f 100644 --- a/src/common/Network/PacketDef/ServerIpcs.h +++ b/src/common/Network/PacketDef/ServerIpcs.h @@ -41,7 +41,7 @@ namespace Sapphire::Network::Packets { SyncReply = 0x0065, LoginReply = 0x0066, - Chat = 0x0067, + ChatToChannel = 0x0067, RegionInfo = 0x0069, MoveTerritory = 0x006A, diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h index 8052d2bd..7a3368ac 100644 --- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h +++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h @@ -45,7 +45,7 @@ namespace Sapphire::Network::Packets::WorldPackets::Server * Structural representation of the packet sent by the server * carrying chat messages */ - struct FFXIVIpcChat : FFXIVIpcBasePacket< Chat > + struct FFXIVIpcChat : FFXIVIpcBasePacket< ChatToChannel > { uint16_t type; uint8_t __padding1; diff --git a/src/world/Manager/AchievementMgr.h b/src/world/Manager/AchievementMgr.h index 437b9227..c928d6c0 100644 --- a/src/world/Manager/AchievementMgr.h +++ b/src/world/Manager/AchievementMgr.h @@ -164,7 +164,7 @@ namespace Sapphire::World::Manager if( !pAchv ) continue; - auto achvExdData = pAchv->data(); + auto& achvExdData = pAchv->data(); if( achvExdData.ConditionArg[ 1 ] <= static_cast< int32_t >( achvData.progressData[ dataKey.u32 ] ) ) unlockAchievement( player, achvId ); diff --git a/src/world/Manager/ChatChannelMgr.cpp b/src/world/Manager/ChatChannelMgr.cpp index ccd6668a..1ab9b176 100644 --- a/src/world/Manager/ChatChannelMgr.cpp +++ b/src/world/Manager/ChatChannelMgr.cpp @@ -1,3 +1,4 @@ +#include #include #include #include @@ -65,10 +66,10 @@ void ChatChannelMgr::addToChannel( uint64_t channelId, Entity::Player& player ) } auto& channelMembers = m_channels[ channelId ]; - auto pPlayer = player.getAsPlayer(); + auto id = player.getId(); - if( std::find( channelMembers.begin(), channelMembers.end(), pPlayer ) == channelMembers.end() ) - m_channels[ channelId ].emplace_back( player.getAsPlayer() ); + if( std::find( channelMembers.begin(), channelMembers.end(), id ) == channelMembers.end() ) + m_channels[ channelId ].emplace_back( id ); } void ChatChannelMgr::removeFromChannel( uint64_t channelId, Entity::Player& player ) @@ -87,9 +88,9 @@ void ChatChannelMgr::removeFromChannel( uint64_t channelId, Entity::Player& play } auto& channelMembers = m_channels[ channelId ]; - auto pPlayer = player.getAsPlayer(); + auto id = player.getId(); - auto it = std::find( channelMembers.begin(), channelMembers.end(), pPlayer ); + auto it = std::find( channelMembers.begin(), channelMembers.end(), id ); if( it != channelMembers.end() ) channelMembers.erase( it ); } @@ -112,34 +113,26 @@ void ChatChannelMgr::sendMessageToChannel( uint64_t channelId, Entity::Player& s auto& channelMembers = m_channels[ channelId ]; auto& server = Common::Service< World::WorldServer >::ref(); + // send message to all players in chat channel - for( const auto& pPlayer : channelMembers ) + for( const auto id : channelMembers ) { // skip sender from getting their own message - if( pPlayer->getId() == sender.getId() ) + if( id == sender.getId() ) continue; - auto pSession = server.getSession( pPlayer->getCharacterId() ); + auto pSession = server.getSession( id ); + // check if player is online to recv message if( !pSession ) { - Logger::error( std::string( __FUNCTION__ ) + ": Session not found for player#{}", pPlayer->getCharacterId() ); continue; } + auto pPlayer = server.getPlayer( id ); + // prepare message packet, associating message and sender info with channel data - auto chatToChannelPacket = makeChatPacket< Server::FFXIVChatToChannel >( pPlayer->getId() ); - - strcpy( chatToChannelPacket->data().message, message.c_str() ); - strcpy( chatToChannelPacket->data().speakerName, sender.getName().c_str() ); - - chatToChannelPacket->data().channelID = channelId; - - chatToChannelPacket->data().speakerCharacterID = sender.getCharacterId(); - chatToChannelPacket->data().speakerEntityID = sender.getId(); - - chatToChannelPacket->data().type = 0; // player message type (eg. GM, etc) - + auto chatToChannelPacket = std::make_shared< Packets::Server::ChatToChannelPacket >( *pPlayer, sender, channelId, message ); pSession->getChatConnection()->queueOutPacket( chatToChannelPacket ); } } diff --git a/src/world/Manager/ChatChannelMgr.h b/src/world/Manager/ChatChannelMgr.h index b7b853b9..16dec38e 100644 --- a/src/world/Manager/ChatChannelMgr.h +++ b/src/world/Manager/ChatChannelMgr.h @@ -6,7 +6,7 @@ namespace Sapphire::Data { - using ChatChannelMembers = std::vector< Entity::PlayerPtr >; + using ChatChannelMembers = std::vector< uint32_t >; union ChatChannel { diff --git a/src/world/Manager/DebugCommandMgr.cpp b/src/world/Manager/DebugCommandMgr.cpp index 88f21195..d6a30186 100644 --- a/src/world/Manager/DebugCommandMgr.cpp +++ b/src/world/Manager/DebugCommandMgr.cpp @@ -536,7 +536,7 @@ void DebugCommandMgr::add( char* data, Entity::Player& player, std::shared_ptr< sscanf( params.c_str(), "%d", &id ); player.setRewardFlag( static_cast< Common::UnlockEntry >( id ) ); } - else if ( subCommand == "effect") + else if( subCommand == "effect" ) { uint16_t param1; sscanf( params.c_str(), "%hu", ¶m1 ); diff --git a/src/world/Network/PacketWrappers/ActorControlPacket.h b/src/world/Network/PacketWrappers/ActorControlPacket.h index 864baf0b..3a1e8b23 100644 --- a/src/world/Network/PacketWrappers/ActorControlPacket.h +++ b/src/world/Network/PacketWrappers/ActorControlPacket.h @@ -1,5 +1,4 @@ -#ifndef _ACTORCONTROL142_H -#define _ACTORCONTROL142_H +#pragma once #include #include @@ -44,6 +43,4 @@ namespace Sapphire::Network::Packets::WorldPackets::Server return std::make_shared< ActorControlPacket >( args... ); } -} - -#endif /*_ACTORCONTROL142_H*/ +} \ No newline at end of file diff --git a/src/world/Network/PacketWrappers/ActorControlSelfPacket.h b/src/world/Network/PacketWrappers/ActorControlSelfPacket.h index 1ea90b8d..80972b56 100644 --- a/src/world/Network/PacketWrappers/ActorControlSelfPacket.h +++ b/src/world/Network/PacketWrappers/ActorControlSelfPacket.h @@ -1,5 +1,4 @@ -#ifndef _ACTORCONTROL143_H -#define _ACTORCONTROL143_H +#pragma once #include #include @@ -47,6 +46,4 @@ namespace Sapphire::Network::Packets::WorldPackets::Server return std::make_shared< ActorControlSelfPacket >( args... ); } -} - -#endif /*_ACTORCONTROL143_H*/ +} \ No newline at end of file diff --git a/src/world/Network/PacketWrappers/ActorControlTargetPacket.h b/src/world/Network/PacketWrappers/ActorControlTargetPacket.h index eb63a45a..98358a20 100644 --- a/src/world/Network/PacketWrappers/ActorControlTargetPacket.h +++ b/src/world/Network/PacketWrappers/ActorControlTargetPacket.h @@ -1,5 +1,4 @@ -#ifndef _ACTORCONTROL144_H -#define _ACTORCONTROL144_H +#pragma once #include #include @@ -46,6 +45,4 @@ namespace Sapphire::Network::Packets::WorldPackets::Server return std::make_shared< ActorControlTargetPacket >( args... ); } -} - -#endif /*_ACTORCONTROL144_H*/ +} \ No newline at end of file diff --git a/src/world/Network/PacketWrappers/ChatPacket.h b/src/world/Network/PacketWrappers/ChatPacket.h index ddd378e2..95d8b450 100644 --- a/src/world/Network/PacketWrappers/ChatPacket.h +++ b/src/world/Network/PacketWrappers/ChatPacket.h @@ -1,5 +1,4 @@ -#ifndef _CHATPACKET_H -#define _CHATPACKET_H +#pragma once #include #include @@ -32,6 +31,4 @@ namespace Sapphire::Network::Packets::WorldPackets::Server }; }; -} - -#endif /*_CHATPACKET_H*/ +} \ No newline at end of file diff --git a/src/world/Network/PacketWrappers/ChatToChannelPacket.h b/src/world/Network/PacketWrappers/ChatToChannelPacket.h new file mode 100644 index 00000000..59912f02 --- /dev/null +++ b/src/world/Network/PacketWrappers/ChatToChannelPacket.h @@ -0,0 +1,41 @@ +#pragma once + +#include "Forwards.h" +#include "Actor/Player.h" +#include +#include + +namespace Sapphire::Network::Packets::Server +{ + + /** + * @brief The Chat packet. + */ + class ChatToChannelPacket : public ChatChannelPacket< FFXIVChatToChannel > + { + public: + ChatToChannelPacket( Entity::Player& target, + Entity::Player& sender, + uint64_t channelId, + const std::string& msg ) : + ChatChannelPacket< FFXIVChatToChannel >( target.getId(), target.getId() ) + { + initialize( sender, channelId, msg ); + }; + + private: + void initialize( Entity::Player& sender, uint64_t channelId, const std::string& msg ) + { + strcpy( m_data.message, msg.c_str() ); + strcpy( m_data.speakerName, sender.getName().c_str() ); + + m_data.channelID = channelId; + + m_data.speakerCharacterID = sender.getCharacterId(); + m_data.speakerEntityID = sender.getId(); + + m_data.type = 0; + }; + }; + +} \ No newline at end of file diff --git a/src/world/Network/PacketWrappers/EffectPacket.h b/src/world/Network/PacketWrappers/EffectPacket.h index c8b4c747..dfb8314b 100644 --- a/src/world/Network/PacketWrappers/EffectPacket.h +++ b/src/world/Network/PacketWrappers/EffectPacket.h @@ -1,5 +1,4 @@ -#ifndef SAPPHIRE_EFFECTPACKET_H -#define SAPPHIRE_EFFECTPACKET_H +#pragma once #include #include @@ -96,6 +95,4 @@ namespace Sapphire::Network::Packets::WorldPackets::Server uint8_t m_sourceEffectCount{ 0 }; }; -} - -#endif //SAPPHIRE_EFFECTPACKET_H +} \ No newline at end of file diff --git a/src/world/Network/PacketWrappers/EventFinishPacket.h b/src/world/Network/PacketWrappers/EventFinishPacket.h index 23436d9a..d8a4b7fe 100644 --- a/src/world/Network/PacketWrappers/EventFinishPacket.h +++ b/src/world/Network/PacketWrappers/EventFinishPacket.h @@ -1,5 +1,4 @@ -#ifndef _EVENTFINISH_H -#define _EVENTFINISH_H +#pragma once #include @@ -34,6 +33,4 @@ namespace Sapphire::Network::Packets::WorldPackets::Server }; }; -} - -#endif /*_EVENTFINISH_H*/ +} \ No newline at end of file diff --git a/src/world/Network/PacketWrappers/EventLogMessagePacket.h b/src/world/Network/PacketWrappers/EventLogMessagePacket.h index cdabce6a..49d89650 100644 --- a/src/world/Network/PacketWrappers/EventLogMessagePacket.h +++ b/src/world/Network/PacketWrappers/EventLogMessagePacket.h @@ -1,5 +1,4 @@ -#ifndef _EVENTLOGMESSAGE_H -#define _EVENTLOGMESSAGE_H +#pragma once #include #include @@ -123,6 +122,4 @@ namespace Sapphire::Network::Packets::WorldPackets::Server std::copy( args.begin(), args.end(), m_data.args ); }; }; -} - -#endif /*_EVENTLOGMESSAGE_H*/ +} \ No newline at end of file diff --git a/src/world/Network/PacketWrappers/EventPlayPacket.h b/src/world/Network/PacketWrappers/EventPlayPacket.h index 430e5e57..d4faff99 100644 --- a/src/world/Network/PacketWrappers/EventPlayPacket.h +++ b/src/world/Network/PacketWrappers/EventPlayPacket.h @@ -1,5 +1,4 @@ -#ifndef _EVENTPLAY_H -#define _EVENTPLAY_H +#pragma once #include #include @@ -338,6 +337,4 @@ namespace Sapphire::Network::Packets::WorldPackets::Server } }; }; -} - -#endif /*_EVENTPLAY_H*/ +} \ No newline at end of file diff --git a/src/world/Network/PacketWrappers/EventResumePacket.h b/src/world/Network/PacketWrappers/EventResumePacket.h index 935f71fb..a8e006a2 100644 --- a/src/world/Network/PacketWrappers/EventResumePacket.h +++ b/src/world/Network/PacketWrappers/EventResumePacket.h @@ -1,4 +1,5 @@ #pragma once + #include #include #include diff --git a/src/world/Network/PacketWrappers/EventStartPacket.h b/src/world/Network/PacketWrappers/EventStartPacket.h index 82e58fee..418fa935 100644 --- a/src/world/Network/PacketWrappers/EventStartPacket.h +++ b/src/world/Network/PacketWrappers/EventStartPacket.h @@ -1,5 +1,4 @@ -#ifndef _EVENTSTART_H -#define _EVENTSTART_H +#pragma once #include #include "Forwards.h" @@ -40,5 +39,4 @@ namespace Sapphire::Network::Packets::WorldPackets::Server }; }; -} -#endif /*_EVENTSTART_H*/ +} \ No newline at end of file diff --git a/src/world/Network/PacketWrappers/HudParamPacket.h b/src/world/Network/PacketWrappers/HudParamPacket.h index 37a77030..2e7f7f71 100644 --- a/src/world/Network/PacketWrappers/HudParamPacket.h +++ b/src/world/Network/PacketWrappers/HudParamPacket.h @@ -1,7 +1,6 @@ #pragma once #include - #include "Forwards.h" namespace Sapphire::Network::Packets::WorldPackets::Server @@ -36,5 +35,4 @@ namespace Sapphire::Network::Packets::WorldPackets::Server { return std::make_shared< HudParamPacket >( args... ); } -} - +} \ No newline at end of file diff --git a/src/world/Network/PacketWrappers/InitZonePacket.h b/src/world/Network/PacketWrappers/InitZonePacket.h index 32ec1c8b..f2aceabf 100644 --- a/src/world/Network/PacketWrappers/InitZonePacket.h +++ b/src/world/Network/PacketWrappers/InitZonePacket.h @@ -1,7 +1,6 @@ #pragma once #include - #include "Forwards.h" namespace Sapphire::Network::Packets::WorldPackets::Server @@ -40,5 +39,4 @@ namespace Sapphire::Network::Packets::WorldPackets::Server { return std::make_shared< InitZonePacket >( args... ); } -} - +} \ No newline at end of file diff --git a/src/world/Network/PacketWrappers/InspectPacket.h b/src/world/Network/PacketWrappers/InspectPacket.h index 02b6b507..7181b630 100644 --- a/src/world/Network/PacketWrappers/InspectPacket.h +++ b/src/world/Network/PacketWrappers/InspectPacket.h @@ -1,5 +1,4 @@ -#ifndef _CORE_NETWORK_PACKETS_EXAMINEPACKET_H -#define _CORE_NETWORK_PACKETS_EXAMINEPACKET_H +#pragma once #include #include @@ -9,7 +8,6 @@ #include "Inventory/Item.h" #include "StatusEffect/StatusEffect.h" - namespace Sapphire::Network::Packets::WorldPackets::Server { @@ -86,6 +84,4 @@ namespace Sapphire::Network::Packets::WorldPackets::Server }; }; -} - -#endif /*_CORE_NETWORK_PACKETS_EXAMINEPACKET_H*/ +} \ No newline at end of file diff --git a/src/world/Network/PacketWrappers/InviteUpdatePacket.h b/src/world/Network/PacketWrappers/InviteUpdatePacket.h index 0347a599..f19e12b6 100644 --- a/src/world/Network/PacketWrappers/InviteUpdatePacket.h +++ b/src/world/Network/PacketWrappers/InviteUpdatePacket.h @@ -6,7 +6,6 @@ namespace Sapphire::Network::Packets::WorldPackets::Server { - class InviteUpdatePacket : public ZoneChannelPacket< FFXIVIpcInviteUpdate > { public: @@ -28,5 +27,4 @@ namespace Sapphire::Network::Packets::WorldPackets::Server strcpy( m_data.InviteName, player.getName().c_str() ); }; }; - } diff --git a/src/world/Network/PacketWrappers/LinkshellResultPacket.h b/src/world/Network/PacketWrappers/LinkshellResultPacket.h index d8e21781..5c2abc38 100644 --- a/src/world/Network/PacketWrappers/LinkshellResultPacket.h +++ b/src/world/Network/PacketWrappers/LinkshellResultPacket.h @@ -1,7 +1,6 @@ #pragma once #include - #include "Forwards.h" #include #include @@ -49,4 +48,3 @@ namespace Sapphire::Network::Packets::WorldPackets::Server return std::make_shared< LinkshellResultPacket >( args... ); } } - diff --git a/src/world/Network/PacketWrappers/ModelEquipPacket.h b/src/world/Network/PacketWrappers/ModelEquipPacket.h index 1fc88935..c82c9145 100644 --- a/src/world/Network/PacketWrappers/ModelEquipPacket.h +++ b/src/world/Network/PacketWrappers/ModelEquipPacket.h @@ -1,5 +1,4 @@ -#ifndef _MODELEQUIPPACKET_H -#define _MODELEQUIPPACKET_H +#pragma once #include #include "Actor/Player.h" @@ -40,6 +39,4 @@ namespace Sapphire::Network::Packets::WorldPackets::Server }; }; -} - -#endif /*_MODELEQUIPPACKET_H*/ +} \ No newline at end of file diff --git a/src/world/Network/PacketWrappers/MoveActorPacket.h b/src/world/Network/PacketWrappers/MoveActorPacket.h index c3c30662..d11f8e9e 100644 --- a/src/world/Network/PacketWrappers/MoveActorPacket.h +++ b/src/world/Network/PacketWrappers/MoveActorPacket.h @@ -1,5 +1,4 @@ -#ifndef _MOVEACTORPACKET_H -#define _MOVEACTORPACKET_H +#pragma once #include #include @@ -7,7 +6,6 @@ #include "Actor/Player.h" #include "Forwards.h" - namespace Sapphire::Network::Packets::WorldPackets::Server { @@ -39,7 +37,4 @@ namespace Sapphire::Network::Packets::WorldPackets::Server }; }; - -} - -#endif /*_MOVEACTORPACKET_H*/ +} \ No newline at end of file diff --git a/src/world/Network/PacketWrappers/Notice2Packet.h b/src/world/Network/PacketWrappers/Notice2Packet.h index 8a87f564..f0ea6f7c 100644 --- a/src/world/Network/PacketWrappers/Notice2Packet.h +++ b/src/world/Network/PacketWrappers/Notice2Packet.h @@ -1,5 +1,4 @@ -#ifndef _QUESTMESSAGE_H -#define _QUESTMESSAGE_H +#pragma once #include #include "Forwards.h" @@ -31,6 +30,4 @@ namespace Sapphire::Network::Packets::WorldPackets::Server }; }; -} - -#endif /* _QUESTMESSAGE_H */ +} \ No newline at end of file diff --git a/src/world/Network/PacketWrappers/NpcSpawnPacket.h b/src/world/Network/PacketWrappers/NpcSpawnPacket.h index 8affb2df..1cf37982 100644 --- a/src/world/Network/PacketWrappers/NpcSpawnPacket.h +++ b/src/world/Network/PacketWrappers/NpcSpawnPacket.h @@ -1,5 +1,4 @@ -#ifndef _PLAYERSPAWN_H -#define _PLAYERSPAWN_H +#pragma once #include #include @@ -107,6 +106,4 @@ namespace Sapphire::Network::Packets::WorldPackets::Server }; }; -} - -#endif /*_PlayerSpawn_H*/ +} \ No newline at end of file diff --git a/src/world/Network/PacketWrappers/PingPacket.h b/src/world/Network/PacketWrappers/PingPacket.h index 0aaf6294..1d363c65 100644 --- a/src/world/Network/PacketWrappers/PingPacket.h +++ b/src/world/Network/PacketWrappers/PingPacket.h @@ -1,5 +1,4 @@ -#ifndef _CORE_NETWORK_PACKETS_PINGPACKET_H -#define _CORE_NETWORK_PACKETS_PINGPACKET_H +#pragma once #include @@ -28,6 +27,4 @@ namespace Sapphire::Network::Packets::WorldPackets::Server }; }; -} - -#endif /*_CORE_NETWORK_PACKETS_CPINGPACKET_H*/ +} \ No newline at end of file diff --git a/src/world/Network/PacketWrappers/PlayerSetupPacket.h b/src/world/Network/PacketWrappers/PlayerSetupPacket.h index d9b2a61f..59ce0e94 100644 --- a/src/world/Network/PacketWrappers/PlayerSetupPacket.h +++ b/src/world/Network/PacketWrappers/PlayerSetupPacket.h @@ -1,5 +1,4 @@ -#ifndef _CORE_NETWORK_PACKETS_INITUIPACKET_H -#define _CORE_NETWORK_PACKETS_INITUIPACKET_H +#pragma once #include #include @@ -89,6 +88,4 @@ namespace Sapphire::Network::Packets::WorldPackets::Server { return std::make_shared< PlayerSetupPacket >( args... ); } -} - -#endif /*_CORE_NETWORK_PACKETS_CINITUIPACKET_H*/ +} \ No newline at end of file diff --git a/src/world/Network/PacketWrappers/PlayerSpawnPacket.h b/src/world/Network/PacketWrappers/PlayerSpawnPacket.h index c8f408df..906bb1ec 100644 --- a/src/world/Network/PacketWrappers/PlayerSpawnPacket.h +++ b/src/world/Network/PacketWrappers/PlayerSpawnPacket.h @@ -1,5 +1,4 @@ -#ifndef _PLAYERSPAWN_H -#define _PLAYERSPAWN_H +#pragma once #include #include @@ -160,6 +159,4 @@ namespace Sapphire::Network::Packets::WorldPackets::Server }; }; -} - -#endif /*_PlayerSpawn_H*/ +} \ No newline at end of file diff --git a/src/world/Network/PacketWrappers/PlayerStateFlagsPacket.h b/src/world/Network/PacketWrappers/PlayerStateFlagsPacket.h index 8d243e3b..3be80118 100644 --- a/src/world/Network/PacketWrappers/PlayerStateFlagsPacket.h +++ b/src/world/Network/PacketWrappers/PlayerStateFlagsPacket.h @@ -1,4 +1,5 @@ #pragma once + #include #include "Actor/Player.h" #include diff --git a/src/world/Network/PacketWrappers/ServerNoticePacket.h b/src/world/Network/PacketWrappers/ServerNoticePacket.h index 486c6f8c..f56d0f28 100644 --- a/src/world/Network/PacketWrappers/ServerNoticePacket.h +++ b/src/world/Network/PacketWrappers/ServerNoticePacket.h @@ -1,5 +1,4 @@ -#ifndef _SERVERNOTICEPACKET_H -#define _SERVERNOTICEPACKET_H +#pragma once #include #include @@ -27,6 +26,4 @@ namespace Sapphire::Network::Packets::WorldPackets::Server }; }; -} - -#endif /*_SERVERNOTICEPACKET_H*/ +} \ No newline at end of file diff --git a/src/world/Network/PacketWrappers/UpdateHpMpTpPacket.h b/src/world/Network/PacketWrappers/UpdateHpMpTpPacket.h index 27f89ed1..78abdf40 100644 --- a/src/world/Network/PacketWrappers/UpdateHpMpTpPacket.h +++ b/src/world/Network/PacketWrappers/UpdateHpMpTpPacket.h @@ -1,5 +1,4 @@ -#ifndef _UPDATEHPMPTP_H -#define _UPDATEHPMPTP_H +#pragma once #include #include @@ -30,6 +29,4 @@ namespace Sapphire::Network::Packets::WorldPackets::Server }; }; -} - -#endif /*_UPDATEHPMPTP_H*/ +} \ No newline at end of file diff --git a/src/world/Network/PacketWrappers/UpdateInventorySlotPacket.h b/src/world/Network/PacketWrappers/UpdateInventorySlotPacket.h index 57d0ee63..c80c7fb0 100644 --- a/src/world/Network/PacketWrappers/UpdateInventorySlotPacket.h +++ b/src/world/Network/PacketWrappers/UpdateInventorySlotPacket.h @@ -1,5 +1,4 @@ -#ifndef _INVENTORY_SLOT_UPDATE_PACKET_H -#define _INVENTORY_SLOT_UPDATE_PACKET_H +#pragma once #include #include "Actor/Player.h" @@ -51,6 +50,4 @@ namespace Sapphire::Network::Packets::WorldPackets::Server }; }; -} - -#endif /*_MODELEQUIPPACKET_H*/ +} \ No newline at end of file diff --git a/src/world/Territory/Territory.cpp b/src/world/Territory/Territory.cpp index c04d6d32..fd68d116 100644 --- a/src/world/Territory/Territory.cpp +++ b/src/world/Territory/Territory.cpp @@ -60,7 +60,8 @@ Territory::Territory() : m_weatherOverride( Common::Weather::None ), m_lastMobUpdate( 0 ), m_nextEObjId( START_EOBJ_ID ), - m_nextActorId( START_GAMEOBJECT_ID ) + m_nextActorId( START_GAMEOBJECT_ID ), + m_inRangeDistance( 80.f ) { } From 9655b4a0ddaae4379faa90be22ff290c373a567a Mon Sep 17 00:00:00 2001 From: Alice Ogeda Date: Thu, 2 Feb 2023 02:39:34 -0300 Subject: [PATCH 2/2] remove unnecessary imports; --- src/world/Manager/ChatChannelMgr.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/world/Manager/ChatChannelMgr.cpp b/src/world/Manager/ChatChannelMgr.cpp index 1ab9b176..d7c99db6 100644 --- a/src/world/Manager/ChatChannelMgr.cpp +++ b/src/world/Manager/ChatChannelMgr.cpp @@ -1,8 +1,5 @@ #include #include -#include -#include -#include #include #include "ChatChannelMgr.h"