diff options
author | Aki <please@ignore.pl> | 2024-03-26 01:45:33 +0100 |
---|---|---|
committer | Aki <please@ignore.pl> | 2024-03-26 01:49:16 +0100 |
commit | ea4c0557d0b7c2317e03d3d3aaefd6063c99f091 (patch) | |
tree | dad4634faf3c17f3642d736f62350df88c117a59 /StarsEx/System.h | |
parent | 38332f77dc1e7bb03776631101eff6e8ad8bcaef (diff) | |
download | starshatter-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/System.h')
-rw-r--r-- | StarsEx/System.h | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/StarsEx/System.h b/StarsEx/System.h index 70262a8..1652d59 100644 --- a/StarsEx/System.h +++ b/StarsEx/System.h @@ -11,15 +11,13 @@ Generic ship System class */ -#ifndef System_h -#define System_h +#pragma once -#include "Types.h" -#include "Physical.h" -#include "Geometry.h" +#include <List.h> +#include <Text.h> -#include "List.h" -#include "Text.h" +#include "Geometry.h" +#include "Physical.h" // +--------------------------------------------------------------------+ @@ -157,10 +155,10 @@ protected: float sink_rate; float power_level; int source_index; - DWORD power_flags; + std::uint32_t power_flags; bool power_on; - BYTE emcon_power[3]; - BYTE emcon; + std::uint8_t emcon_power[3]; + std::uint8_t emcon; int explosion_type; @@ -168,6 +166,3 @@ protected: SystemDesign* design; List<Component> components; }; - -#endif // System_h - |