summaryrefslogtreecommitdiffhomepage
path: root/StarsEx/WeaponGroup.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/WeaponGroup.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/WeaponGroup.h')
-rw-r--r--StarsEx/WeaponGroup.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/StarsEx/WeaponGroup.h b/StarsEx/WeaponGroup.h
index a35ba76..3edad1d 100644
--- a/StarsEx/WeaponGroup.h
+++ b/StarsEx/WeaponGroup.h
@@ -11,12 +11,15 @@
Weapon Control Category (Group) class
*/
-#ifndef WeaponGroup_h
-#define WeaponGroup_h
+#pragma once
-#include "Types.h"
+#include <cstdint>
+
+#include <Text.h>
+
+#include "SimObject.h"
+#include "System.h"
#include "Weapon.h"
-#include "Text.h"
// +--------------------------------------------------------------------+
@@ -77,7 +80,7 @@ public:
int Status() const;
WeaponDesign* GetDesign() const;
- bool CanTarget(DWORD tgt_class) const;
+ bool CanTarget(std::uint32_t tgt_class) const;
void PowerOn();
void PowerOff();
@@ -100,6 +103,3 @@ protected:
float mass;
float resist;
};
-
-#endif // WeaponGroup_h
-