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, 8 insertions, 10 deletions

diff --git a/StarsEx/SimObject.h b/StarsEx/SimObject.h
index 0985e99..955a204 100644
--- a/StarsEx/SimObject.h
+++ b/StarsEx/SimObject.h
@@ -11,12 +11,13 @@
     Simulation Object and Observer classes
 */
 
-#ifndef SimObject_h
-#define SimObject_h
+#pragma once
+
+#include <cstdint>
+
+#include <List.h>
 
-#include "Types.h"
 #include "Physical.h"
-#include "List.h"
 
 // +--------------------------------------------------------------------+
 
@@ -58,8 +59,8 @@ public:
     virtual void         Activate(Scene& scene);
     virtual void         Deactivate(Scene& scene);
 
-    virtual DWORD        GetObjID()                 const { return objid;   }
-    virtual void         SetObjID(DWORD id)               { objid = id;     }
+    virtual std::uint32_t  GetObjID()                 const { return objid;   }
+    virtual void           SetObjID(std::uint32_t id)       { objid = id;     }
 
     virtual bool         IsHostileTo(const SimObject* o)
     const { return false;   }
@@ -67,7 +68,7 @@ public:
 protected:
     SimRegion*           region;
     List<SimObserver>    observers;
-    DWORD                objid;
+    std::uint32_t        objid;
     bool                 active;
     bool                 notifying;
 };
@@ -93,6 +94,3 @@ public:
 protected:
     List<SimObject>      observe_list;
 };
-
-#endif  // SimObject_h
-