a mess but stable

[carveJwlIkooP6JGAAIwe30JlM.git] / gameserver.h

diff --git a/gameserver.h b/gameserver.h
index ac1c4914201c5b8cca64e8ed825c36e9ba0f2164..a03b1a0ac9c300609c7a6c7dc505fbb62d02c42b 100644 (file)
--- a/gameserver.h
+++ b/gameserver.h
@@ -1,21 +1,18 @@
-#ifndef GAMESERVER_H
-#define GAMESERVER_H
-
+#pragma once
 #define VG_SERVER
 
-#include "vg/vg.h"
+#include "vg/vg_platform.h"
 #include "vg/vg_steam.h"
 #include "vg/vg_steam_networking.h"
 #include "vg/vg_steam_http.h"
 #include "vg/vg_steam_auth.h"
 #include "network_msg.h"
 #include "network_common.h"
-#include "highscores.h"
 #include <sys/socket.h>
 
 #define CLIENT_KNOWLEDGE_SAME_WORLD0 0x1
 #define CLIENT_KNOWLEDGE_SAME_WORLD1 0x2
-#define CLIENT_KNOWLEDGE_FRIENDS     0x4 /* TODO? */
+#define CLIENT_KNOWLEDGE_FRIENDS     0x4 /* unused */
 
 struct {
    HSteamNetPollGroup client_group;
@@ -36,6 +33,9 @@ struct {
       }
       items[k_netmsg_playeritem_max];
 
+      char region[ NETWORK_REGION_MAX ];
+      u32  region_flags;
+
       u64  steamid;
    }
    clients[ NETWORK_MAX_PLAYERS ];
@@ -43,14 +43,10 @@ struct {
    u8 client_knowledge_mask[ (NETWORK_MAX_PLAYERS*(NETWORK_MAX_PLAYERS-1))/2 ];
    u8 app_symmetric_key[ k_nSteamEncryptedAppTicketSymmetricKeyLen ];
 
-   /* TODO: Consider removing this */
-   int monitor_fd;
-   int monitor_clients[ 4 ];
+   bool loopback_test;
 }
 static gameserver = {
    .auth_mode = eServerModeAuthentication
 };
 
 static ISteamNetworkingSockets *hSteamNetworkingSockets = NULL;
-
-#endif /* GAMESERVER_H */