network items, interp boundaries

[carveJwlIkooP6JGAAIwe30JlM.git] / gameserver.c

diff --git a/gameserver.c b/gameserver.c
index 6965eead8997060c33875f8ee9ab39d6b7a1dc23..c0eca6757e5958c47830097d6393a7402ef8c939 100644 (file)
--- a/gameserver.c
+++ b/gameserver.c
@@ -92,23 +92,16 @@ static void gameserver_player_join( int index ){
             username, size, k_nSteamNetworkingSend_Reliable, NULL );
 
       /* items */
-      chs = vg_strncpy( client->item_player, item->uid, ADDON_UID_MAX, 
-                        k_strncpy_always_add_null );
-      item->type = k_addon_type_player;
-      item->client = i;
-      size = sizeof(netmsg_playeritem) + chs + 1;
-      SteamAPI_ISteamNetworkingSockets_SendMessageToConnection(
-            hSteamNetworkingSockets, joiner->connection,
-            item, size, k_nSteamNetworkingSend_Reliable, NULL );
-
-      chs = vg_strncpy( client->item_board, item->uid, ADDON_UID_MAX, 
-                        k_strncpy_always_add_null );
-      item->type = k_addon_type_board;
-      item->client = i;
-      size = sizeof(netmsg_playeritem) + chs + 1;
-      SteamAPI_ISteamNetworkingSockets_SendMessageToConnection(
-            hSteamNetworkingSockets, joiner->connection,
-            item, size, k_nSteamNetworkingSend_Reliable, NULL );
+      for( int j=0; j<k_netmsg_playeritem_max; j++ ){
+         chs = vg_strncpy( client->items[j], item->uid, ADDON_UID_MAX, 
+                           k_strncpy_always_add_null );
+         item->type_index = j;
+         item->client = i;
+         size = sizeof(netmsg_playeritem) + chs + 1;
+         SteamAPI_ISteamNetworkingSockets_SendMessageToConnection(
+               hSteamNetworkingSockets, joiner->connection,
+               item, size, k_nSteamNetworkingSend_Reliable, NULL );
+      }
    }
 }
 
@@ -146,6 +139,7 @@ static void new_client_connecting( HSteamNetConnection client ){
             hSteamNetworkingSockets, client );
    if( accept_status == k_EResultOK ){
       vg_success( "Accepted client (id: %u, index: %d)\n", client, index );
+      memset( &gameserver.clients[index], 0, sizeof(struct gameserver_client) );
 
       gameserver.clients[index].active = 1;
       gameserver.clients[index].connection = client;
@@ -351,8 +345,7 @@ static void gameserver_rx_200_300( SteamNetworkingMessage_t *msg ){
       u32 chs = vg_strncpy( client->username, prop->name, NETWORK_USERNAME_MAX,
                             k_strncpy_always_add_null );
 
-      vg_info( "client #%d changed name to: %s [%s]\n", client_id, 
-               client->username, prop->name );
+      vg_info( "client #%d changed name to: %s\n", client_id, prop->name );
 
       u32 propsize = sizeof(netmsg_playerusername) + chs + 1;
       gameserver_send_to_all( client_id, prop, propsize,
@@ -372,21 +365,24 @@ static void gameserver_rx_200_300( SteamNetworkingMessage_t *msg ){
       /* record */
       struct gameserver_client *client = &gameserver.clients[ client_id ];
 
-      if( item->type == k_addon_type_board ){
-         network_msgstring( item->uid, msg->m_cbSize, sizeof(netmsg_playeritem),
-                            client->item_board, ADDON_UID_MAX );
-      }
-      else if( item->type == k_addon_type_player ){
-         network_msgstring( item->uid, msg->m_cbSize, sizeof(netmsg_playeritem),
-                            client->item_player, ADDON_UID_MAX );
-      }
-      else {
+      if( item->type_index >= k_netmsg_playeritem_max ){
          vg_warn( "Client #%d invalid equip type %u\n", 
-                  client_id, (u32)item->type );
+                  client_id, (u32)item->type_index );
          return;
       }
-      vg_info( "Client #%d equiped: [%u] %s\n", 
-               item->client, item->type, item->uid );
+      
+      char *dest = client->items[ item->type_index ];
+
+      network_msgstring( item->uid, msg->m_cbSize, sizeof(netmsg_playeritem),
+                         dest, ADDON_UID_MAX );
+
+      vg_info( "Client #%d equiped: [%s] %s\n", 
+               item->client, 
+               (const char *[]){[k_netmsg_playeritem_board]="board",
+                                [k_netmsg_playeritem_player]="player",
+                                [k_netmsg_playeritem_world0]="world0",
+                                [k_netmsg_playeritem_world1]="world1"
+               }[item->type_index], item->uid );
                            
       /* propogate */
       netmsg_playeritem *prop = alloca(msg->m_cbSize);