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

At demo's recommendation, stuffed FieldMarkerStatus in Common.h; also added the PlaceFieldMarker struct

Browse source
This commit is contained in:
pmgr 2020-06-21 01:09:19 +01:00
parent 7c396b90b5
commit d9777084c5
3 changed files with 29 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/common/Common.h
View file

@ -566,6 +566,18 @@ namespace Sapphire::Common
};
enum FieldMarkerStatus : uint32_t
{
A = 0x1,
B = 0x2,
C = 0x4,
D = 0x8,
One = 0x10,
Two = 0x20,
Three = 0x40,
Four = 0x80
};
enum struct ActionAspect : uint8_t
{
None = 0, // Doesn't imply unaspected

4
src/common/Network/PacketDef/Ipcs.h
View file

@ -336,8 +336,8 @@ namespace Sapphire::Network::Packets
ClientTrigger = 0x017D, // updated 5.25
DiscoveryHandler = 0x02C8, // updated 5.25
PlaceFieldMarkerPreset = 0x23F, // updated 5.25
PlaceFieldMarker = 0x013C, // updated 5.0
PlaceFieldMarkerPreset = 0x023F, // updated 5.25
PlaceFieldMarker = 0x01BA, // updated 5.25
SkillHandler = 0x0241, // updated 5.25
GMCommand1 = 0x01EC, // updated 5.25
GMCommand2 = 0x0368, // updated 5.25

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

@ -1687,25 +1687,28 @@ namespace Sapphire::Network::Packets::Server
*/
struct FFXIVIpcPlaceFieldMarkerPreset : FFXIVIpcBasePacket< PlaceFieldMarkerPreset >
{
enum FieldMarkerStatus
{
A = 0x1,
B = 0x2,
C = 0x4,
D = 0x8,
One = 0x10,
Two = 0x20,
Three = 0x40,
Four = 0x80
};
/*! which fieldmarks to show */
enum FieldMarkerStatus status;
Common::FieldMarkerStatus status;
/*! A coordinates would be (float)Xints[0]/1000.0, (float)Yints[0]/1000.0, (float)Zints[0]/1000.0 */
uint32_t Xints[8];
uint32_t Yints[8];
uint32_t Zints[8];
};
/**
* Structural representation of the packet sent by the server
* to place/remove a field marker
*/
struct FFXIVIpcPlaceFieldMarker : FFXIVIpcBasePacket< PlaceFieldMarker >
{
uint8_t markerId;
uint8_t status;
uint8_t pad[2];
uint32_t Xint;
uint32_t Yint;
uint32_t Zint;
};
/**
* Structural representation of the packet sent by the server
* to mount a player