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

diff --git a/gameserver.c b/gameserver.c
index abd5aaa..6965eea 100644
--- a/gameserver.c
+++ b/gameserver.c
@@ -95,6 +95,7 @@ static void gameserver_player_join( int index ){
       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,
@@ -103,6 +104,7 @@ static void gameserver_player_join( int index ){
       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,
@@ -346,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,
@@ -365,14 +367,32 @@ static void gameserver_rx_200_300( SteamNetworkingMessage_t *msg ){
                               k_nSteamNetworkingSend_Unreliable );
    }
    else if( tmp->inetmsg_id == k_inetmsg_playeritem ){
-      netmsg_playeritem *item = alloca(msg->m_cbSize);
-      memcpy( item, msg->m_pData, msg->m_cbSize );
-      item->client = client_id;
+      netmsg_playeritem *item = msg->m_pData;
 
-      vg_info( "Client #%u equiped: [%u] %s\n", 
-               item->client, item->type, item->uid );
+      /* record */
+      struct gameserver_client *client = &gameserver.clients[ client_id ];
 
-      gameserver_send_to_all( client_id, item, msg->m_cbSize, 
+      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 );
    }
 }