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

Merge pull request #893 from hkAlice/unfourtunate-warps

Browse source 
[3.x] temporarily move integritystatus to zonedef;
This commit is contained in:
Mordred 2023-02-13 16:22:19 +01:00 • committed by GitHub
commit c61e367c5a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/common/Common.h
View file

@ -1048,18 +1048,6 @@ namespace Sapphire::Common
CalcResultParam CalcResultCt[4]; CalcResultParam CalcResultCt[4];
}; };
struct IntegrityStatus
{
uint8_t Slot;
uint8_t __padding1;
uint16_t Id;
int16_t SystemParam;
uint8_t __padding2;
uint8_t __padding3;
float Time;
uint32_t Source;
};
enum class ActionCollisionType : uint8_t enum class ActionCollisionType : uint8_t
{ {
None, None,

14
src/common/Network/PacketDef/Zone/ServerZoneDef.h
View file

@ -469,6 +469,18 @@ namespace Sapphire::Network::Packets::WorldPackets::Server
uint8_t Type; uint8_t Type;
}; };
struct IntegrityStatus {
uint8_t Slot;
uint8_t __padding1;
uint16_t Id;
int16_t SystemParam;
uint8_t __padding2;
uint8_t __padding3;
float Time;
uint32_t Source;
uint8_t unknown_3_2;
};
/** /**
* Structural representation of the packet sent by the server * Structural representation of the packet sent by the server
* add a status effect * add a status effect
@ -488,7 +500,7 @@ namespace Sapphire::Network::Packets::WorldPackets::Server
uint16_t MpMax; uint16_t MpMax;
uint8_t StatusCount; uint8_t StatusCount;
uint8_t __padding3; uint8_t __padding3;
Common::IntegrityStatus Status[4]; IntegrityStatus Status[4];
}; };
/** /**