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/Thruster.h | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'StarsEx/Thruster.h') diff --git a/StarsEx/Thruster.h b/StarsEx/Thruster.h index ea98fd9..c64de31 100644 --- a/StarsEx/Thruster.h +++ b/StarsEx/Thruster.h @@ -11,10 +11,12 @@ Conventional Thruster (system) class */ -#ifndef Thruster_h -#define Thruster_h +#pragma once + +#include + +#include -#include "Types.h" #include "System.h" #include "Geometry.h" @@ -27,11 +29,11 @@ class Ship; struct ThrusterPort { static const char* TYPENAME() { return "ThrusterPort"; } - ThrusterPort(int t, const Point& l, DWORD f, float s); + ThrusterPort(int t, const Point& l, std::uint32_t f, float s); ~ThrusterPort(); int type; - DWORD fire; + std::uint32_t fire; float burn; float scale; Point loc; @@ -66,8 +68,8 @@ public: virtual double TransYLimit(); virtual double TransZLimit(); - virtual void AddPort(int type, const Point& loc, DWORD fire, float flare_scale=0); - virtual void CreatePort(int type, const Point& loc, DWORD fire, float flare_scale); + virtual void AddPort(int type, const Point& loc, std::uint32_t fire, float flare_scale=0); + virtual void CreatePort(int type, const Point& loc, std::uint32_t fire, float flare_scale); int NumThrusters() const; Graphic* Flare(int engine) const; @@ -91,6 +93,3 @@ protected: List ports; }; - -#endif // Thruster_h - -- cgit v1.1