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, 11 deletions

diff --git a/StarsEx/NetUser.h b/StarsEx/NetUser.h
index e218aca..69499f4 100644
--- a/StarsEx/NetUser.h
+++ b/StarsEx/NetUser.h
@@ -11,14 +11,15 @@
     This class represents a user connecting to the multiplayer lobby
 */
 
+#pragma once
 
-#ifndef NetUser_h
-#define NetUser_h
+#include <cstdint>
 
-#include "Types.h"
+#include <Text.h>
+
+#include "Color.h"
 #include "NetAddr.h"
 #include "NetLobby.h"
-#include "Color.h"
 
 // +-------------------------------------------------------------------+
 
@@ -42,7 +43,7 @@ public:
     const NetAddr& GetAddress()   const { return addr;          }
     Color          GetColor()     const { return color;         }
     const Text&    GetSessionID() const { return session_id;    }
-    DWORD          GetNetID()     const { return netid;         }
+    std::uint32_t  GetNetID()     const { return netid;         }
     bool           IsHost()       const { return host;          }
 
     int            AuthLevel()    const { return auth_level;    }
@@ -64,7 +65,7 @@ public:
     { addr = a;       }
 
     void           SetColor(Color c)          { color = c;      }
-    void           SetNetID(DWORD id)         { netid = id;     }
+    void           SetNetID(std::uint32_t id) { netid = id;     }
     void           SetSessionID(Text s)       { session_id = s; }
     void           SetHost(bool h)            { host = h;       }
 
@@ -87,7 +88,7 @@ protected:
     Text        pass;
     Text        session_id;
     NetAddr     addr;
-    DWORD       netid;
+    std::uint32_t netid;
     Color       color;
     bool        host;
 
@@ -105,7 +106,3 @@ protected:
     int         kills;
     int         losses;
 };
-
-// +-------------------------------------------------------------------+
-
-#endif  // NetUser_h
\ No newline at end of file