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.

1 files changed, 7 insertions, 10 deletions

diff --git a/StarsEx/Contact.h b/StarsEx/Contact.h
index 66acb9c..dbc4ed6 100644
--- a/StarsEx/Contact.h
+++ b/StarsEx/Contact.h
@@ -11,10 +11,10 @@
     Sensor Contact class
 */
 
-#ifndef Contact_h
-#define Contact_h
+#pragma once
+
+#include <cstdint>
 
-#include "Types.h"
 #include "SimObject.h"
 #include "System.h"
 #include "Geometry.h"
@@ -49,7 +49,7 @@ public:
     double   Age()       const;
     bool     IsProbed()  const { return probe; }
 
-    DWORD    AcquisitionTime() const { return acquire_time; }
+    std::uint32_t AcquisitionTime() const { return acquire_time; }
 
     int      GetIFF(const Ship* observer)    const;
     void     GetBearing(const Ship* observer, double& az, double& el, double& r) const;
@@ -74,17 +74,14 @@ private:
     Ship*    ship;
     Shot*    shot;
     Point    loc;
-    DWORD    acquire_time;
-    DWORD    time;
+    std::uint32_t  acquire_time;
+    std::uint32_t  time;
 
     Point*   track;
     int      ntrack;
-    DWORD    track_time;
+    std::uint32_t  track_time;
 
     float    d_pas;   // power output
     float    d_act;   // mass, size
     bool     probe;   // scanned by probe
 };
-
-#endif  // Contact_h
-