X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=gameserver.c;h=6965eead8997060c33875f8ee9ab39d6b7a1dc23;hb=9385ff1868a052d92d60c0b49aa03848460b1916;hp=5ed561249c707d3e132440a50ea9927788345379;hpb=825c3bce18272c0f81659e0eac469709d0462836;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/gameserver.c b/gameserver.c
index 5ed5612..6965eea 100644
--- a/gameserver.c
+++ b/gameserver.c
@@ -60,10 +60,14 @@ static void gameserver_player_join( int index ){
 
    /* update the joining user about current connections */
 
-   netmsg_playerusername *username = alloca( sizeof(netmsg_playerusername) + 
-                                             NETWORK_USERNAME_MAX );
+   netmsg_playerusername *username = 
+      alloca( sizeof(netmsg_playerusername) + NETWORK_USERNAME_MAX );
    username->inetmsg_id = k_inetmsg_playerusername;
 
+   netmsg_playeritem *item = 
+      alloca( sizeof(netmsg_playeritem) + ADDON_UID_MAX );
+   item->inetmsg_id = k_inetmsg_playeritem;
+
    for( int i=0; i<vg_list_size(gameserver.clients); i++ ){
       struct gameserver_client *client = &gameserver.clients[i];
 
@@ -86,6 +90,25 @@ static void gameserver_player_join( int index ){
       SteamAPI_ISteamNetworkingSockets_SendMessageToConnection(
             hSteamNetworkingSockets, joiner->connection,
             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 );
    }
 }
 
@@ -325,11 +348,11 @@ static void gameserver_rx_200_300( SteamNetworkingMessage_t *msg ){
                                            
       prop->inetmsg_id = k_inetmsg_playerusername;
       prop->index = client_id;
-      u32 chs = vg_strncpy( client->username, prop->name, name_len,
+      u32 chs = vg_strncpy( client->username, prop->name, NETWORK_USERNAME_MAX,
                             k_strncpy_always_add_null );
 
-      vg_info( "client #%d changed name to: %s\n", client_id, 
-               client->username );
+      vg_info( "client #%d changed name to: %s [%s]\n", client_id, 
+               client->username, prop->name );
 
       u32 propsize = sizeof(netmsg_playerusername) + chs + 1;
       gameserver_send_to_all( client_id, prop, propsize,
@@ -337,13 +360,41 @@ static void gameserver_rx_200_300( SteamNetworkingMessage_t *msg ){
    }
    else if( tmp->inetmsg_id == k_inetmsg_playerframe ){
       /* propogate */
-
       netmsg_playerframe *frame = alloca(msg->m_cbSize);
       memcpy( frame, msg->m_pData, msg->m_cbSize );
       frame->client = client_id;
       gameserver_send_to_all( client_id, frame, msg->m_cbSize, 
                               k_nSteamNetworkingSend_Unreliable );
    }
+   else if( tmp->inetmsg_id == k_inetmsg_playeritem ){
+      netmsg_playeritem *item = msg->m_pData;
+
+      /* 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 {
+         vg_warn( "Client #%d invalid equip type %u\n", 
+                  client_id, (u32)item->type );
+         return;
+      }
+      vg_info( "Client #%d equiped: [%u] %s\n", 
+               item->client, item->type, item->uid );
+                           
+      /* propogate */
+      netmsg_playeritem *prop = alloca(msg->m_cbSize);
+      memcpy( prop, msg->m_pData, msg->m_cbSize );
+      prop->client = client_id;
+      gameserver_send_to_all( client_id, prop, msg->m_cbSize, 
+                              k_nSteamNetworkingSend_Reliable );
+   }
 }
 
 #if 0