X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=gameserver.h;h=3d0e71383bf9b5a8a2d0afe73e1b77ffde16d923;hb=72f789aa46c913ec2ffa10907b2124f8d09670e5;hp=2f5cfd4600bab13ced741ad7f3f11eee1b00bd8c;hpb=074fa69f479724f9800849430bad5caf730b01ef;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/gameserver.h b/gameserver.h
index 2f5cfd4..3d0e713 100644
--- a/gameserver.h
+++ b/gameserver.h
@@ -1,39 +1,56 @@
-#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? */
+
 struct {
    HSteamNetPollGroup client_group;
    EServerMode auth_mode;
 
    struct gameserver_client {
       int active;
+      u32 version;
       int authenticated;
       HSteamNetConnection connection;
       char username[ NETWORK_USERNAME_MAX ];
-      char items[k_netmsg_playeritem_max][ADDON_UID_MAX];
+
+      u8 instance;
+
+      struct gameserver_item {
+         char uid[ADDON_UID_MAX];
+         u32  hash;
+      }
+      items[k_netmsg_playeritem_max];
+
+      char region[ NETWORK_REGION_MAX ];
+      u32  region_flags;
+
+      u64  steamid;
    }
    clients[ NETWORK_MAX_PLAYERS ];
 
+   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 */