summaryrefslogtreecommitdiffhomepage
path: root/StarsEx/Thruster.h
diff options
context:
space:
mode:
authorAki <please@ignore.pl>2024-03-26 01:45:33 +0100
committerAki <please@ignore.pl>2024-03-26 01:49:16 +0100
commitea4c0557d0b7c2317e03d3d3aaefd6063c99f091 (patch)
treedad4634faf3c17f3642d736f62350df88c117a59 /StarsEx/Thruster.h
parent38332f77dc1e7bb03776631101eff6e8ad8bcaef (diff)
downloadstarshatter-ea4c0557d0b7c2317e03d3d3aaefd6063c99f091.zip
starshatter-ea4c0557d0b7c2317e03d3d3aaefd6063c99f091.tar.gz
starshatter-ea4c0557d0b7c2317e03d3d3aaefd6063c99f091.tar.bz2
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.
Diffstat (limited to 'StarsEx/Thruster.h')
-rw-r--r--StarsEx/Thruster.h19
1 files changed, 9 insertions, 10 deletions
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 <cstdint>
+
+#include <List.h>
-#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<ThrusterPort> ports;
};
-
-#endif // Thruster_h
-