From ea4c0557d0b7c2317e03d3d3aaefd6063c99f091 Mon Sep 17 00:00:00 2001 From: Aki Date: Tue, 26 Mar 2024 01:45:33 +0100 Subject: DWORD replaced with std::uint32_t in non-Win32-related parts With the exception of some netcode. This brings some important questions and solidifies me in pursuing better abstract over definitions. It might also be a good idea to have distinct aliases or compound types for time and (net) identifiers. --- StarsEx/NetPacket.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) (limited to 'StarsEx/NetPacket.h') diff --git a/StarsEx/NetPacket.h b/StarsEx/NetPacket.h index c527c1e..437aaf8 100644 --- a/StarsEx/NetPacket.h +++ b/StarsEx/NetPacket.h @@ -11,10 +11,10 @@ Wrapper for low-level datagram class */ -#ifndef NetPacket_h -#define NetPacket_h +#pragma once + +#include -#include "Types.h" #include "Geometry.h" #include "NetData.h" @@ -31,19 +31,20 @@ public: static const char* TYPENAME() { return "NetPacket"; } NetPacket(NetMsg* g); - NetPacket(DWORD netid, BYTE type); + NetPacket(std::uint32_t netid, std::uint8_t type); ~NetPacket(); bool Send(NetLink& link); // various accessors: - DWORD NetID() const; - BYTE Type() const; + std::uint32_t NetID() const; + std::uint8_t Type() const; + + std::uint32_t GetPingSequence(); + void SetPingSequence(std::uint32_t seq); + std::uint32_t GetNetID(); + void SetNetID(std::uint32_t id); - DWORD GetPingSequence(); - void SetPingSequence(DWORD seq); - DWORD GetNetID(); - void SetNetID(DWORD id); Point GetShipLocation(); void SetShipLocation(const Point& loc); Point GetShipVelocity(); @@ -61,13 +62,6 @@ public: bool GetTrigger(int i); void SetTrigger(int i, bool trigger); - protected: NetMsg* msg; }; - - -// +--------------------------------------------------------------------+ - -#endif // NetPacket_h - -- cgit v1.1