etc
/
SmoOnlineServer
mirror of https://github.com/Sanae6/SmoOnlineServer.git
0
0
Fork 0
Code Issues Projects Releases Wiki Activity

Shared/Packets: Tweak (de)serialization offsets to a more stable layout 

Also:
- Add a missing ShinePacket field
This commit is contained in:
Nick Renieris 2022-06-22 20:20:04 +03:00
parent f9c20e73a8
commit 4656b8af40
4 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Shared/Packet/Packets/CapPacket.cs
View File

@ -12,7 +12,7 @@ public struct CapPacket : IPacket {
public bool CapOut; public bool CapOut;
public string CapAnim; public string CapAnim;
public short Size => 0x50; public short Size => 32 + NameSize;
public void Serialize(Span<byte> data) { public void Serialize(Span<byte> data) {
MemoryMarshal.Write(data, ref Position); MemoryMarshal.Write(data, ref Position);

10
Shared/Packet/Packets/GamePacket.cs
View File

@ -12,16 +12,16 @@ public struct GamePacket : IPacket {
public GamePacket() { } public GamePacket() { }
public short Size => 0x42; public short Size => 5 + StageSize;
public void Serialize(Span<byte> data) { public void Serialize(Span<byte> data) {
MemoryMarshal.Write(data, ref Is2d); MemoryMarshal.Write(data, ref Is2d);
MemoryMarshal.Write(data[1..], ref ScenarioNum); MemoryMarshal.Write(data[4..], ref ScenarioNum);
Encoding.UTF8.GetBytes(Stage).CopyTo(data[2..(2 + StageSize)]); Encoding.UTF8.GetBytes(Stage).CopyTo(data[5..(5 + StageSize)]);
} }
public void Deserialize(ReadOnlySpan<byte> data) { public void Deserialize(ReadOnlySpan<byte> data) {
Is2d = MemoryMarshal.Read<bool>(data); Is2d = MemoryMarshal.Read<bool>(data);
ScenarioNum = MemoryMarshal.Read<byte>(data[1..]); ScenarioNum = MemoryMarshal.Read<byte>(data[4..]);
Stage = Encoding.UTF8.GetString(data[2..(2 + StageSize)]).TrimEnd('\0'); Stage = Encoding.UTF8.GetString(data[5..(5 + StageSize)]).TrimEnd('\0');
} }
} }

5
Shared/Packet/Packets/ShinePacket.cs
View File

@ -5,14 +5,17 @@ namespace Shared.Packet.Packets;
[Packet(PacketType.Shine)] [Packet(PacketType.Shine)]
public struct ShinePacket : IPacket { public struct ShinePacket : IPacket {
public int ShineId; public int ShineId;
public bool IsGrand;
public short Size => 4; public short Size => 8;
public void Serialize(Span<byte> data) { public void Serialize(Span<byte> data) {
MemoryMarshal.Write(data, ref ShineId); MemoryMarshal.Write(data, ref ShineId);
MemoryMarshal.Write(data[4..], ref IsGrand);
} }
public void Deserialize(ReadOnlySpan<byte> data) { public void Deserialize(ReadOnlySpan<byte> data) {
ShineId = MemoryMarshal.Read<int>(data); ShineId = MemoryMarshal.Read<int>(data);
IsGrand = MemoryMarshal.Read<bool>(data[4..]);
} }
} }

10
Shared/Packet/Packets/TagPacket.cs
View File

@ -9,20 +9,20 @@ public struct TagPacket : IPacket {
public byte Seconds; public byte Seconds;
public ushort Minutes; public ushort Minutes;
public short Size => 6; public short Size => 8;
public void Serialize(Span<byte> data) { public void Serialize(Span<byte> data) {
MemoryMarshal.Write(data, ref UpdateType); MemoryMarshal.Write(data, ref UpdateType);
MemoryMarshal.Write(data[1..], ref IsIt); MemoryMarshal.Write(data[1..], ref IsIt);
MemoryMarshal.Write(data[2..], ref Seconds); MemoryMarshal.Write(data[5..], ref Seconds);
MemoryMarshal.Write(data[4..], ref Minutes); MemoryMarshal.Write(data[6..], ref Minutes);
} }
public void Deserialize(ReadOnlySpan<byte> data) { public void Deserialize(ReadOnlySpan<byte> data) {
UpdateType = MemoryMarshal.Read<TagUpdate>(data); UpdateType = MemoryMarshal.Read<TagUpdate>(data);
IsIt = MemoryMarshal.Read<bool>(data[1..]); IsIt = MemoryMarshal.Read<bool>(data[1..]);
Seconds = MemoryMarshal.Read<byte>(data[2..]); Seconds = MemoryMarshal.Read<byte>(data[5..]);
Minutes = MemoryMarshal.Read<ushort>(data[4..]); Minutes = MemoryMarshal.Read<ushort>(data[6..]);
} }
[Flags] [Flags]