X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=network.c;h=838653c33e8208b1174aa319e2a0b1977933bfe4;hb=603805f69c5484316a52ee099d03254c5a1096f3;hp=4768ece1a14ebcd32129b6e2f49e672f95313582;hpb=730f202673d6ceb2a5199cf244d5c0bddc064fcf;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/network.c b/network.c
index 4768ece..838653c 100644
--- a/network.c
+++ b/network.c
@@ -135,7 +135,7 @@ static void network_send_username(void){
    netmsg_playerusername *update = alloca( sizeof(netmsg_playerusername)+
                                            NETWORK_USERNAME_MAX );
    update->inetmsg_id = k_inetmsg_playerusername;
-   update->index = 0xffffffff;
+   update->index = 0xff;
 
    ISteamFriends *hSteamFriends = SteamAPI_SteamFriends();
    const char *username = SteamAPI_ISteamFriends_GetPersonaName(hSteamFriends);
@@ -147,38 +147,61 @@ static void network_send_username(void){
          k_nSteamNetworkingSend_Reliable, NULL );
 }
 
-static void network_send_item( enum addon_type type ){
-   if( network_client.remote ){
-      u16 id = 0;
-      if( type == k_addon_type_board )
-         id = localplayer.board_view_slot;
-      else if( type == k_addon_type_player )
-         id = localplayer.playermodel_view_slot;
+static void network_send_item( enum netmsg_playeritem_type type ){
+   if( !network_client.remote )
+      return;
 
-      struct addon_cache *cache = &addon_system.cache[type];
-      vg_pool *pool = &cache->pool;
+   netmsg_playeritem *item = 
+      alloca( sizeof(netmsg_playeritem) + ADDON_UID_MAX );
+   item->inetmsg_id = k_inetmsg_playeritem;
+   item->type_index = type;
+   item->client = 0;
+
+   if( (type == k_netmsg_playeritem_world0) ||
+       (type == k_netmsg_playeritem_world1) ){
+
+      addon_reg *reg = world_static.addon_hub;
+
+      if( type == k_netmsg_playeritem_world1 )
+         reg = world_static.addon_client;
+
+      if( reg )
+         addon_alias_uid( &reg->alias, item->uid );
+      else 
+         item->uid[0] = '\0';
+   }
+   else{
+      u16 view_id = 0;
+      enum addon_type addon_type = k_addon_type_none;
+      if( type == k_netmsg_playeritem_board ){
+         view_id = localplayer.board_view_slot;
+         addon_type = k_addon_type_board;
+      }
+      else if( type == k_netmsg_playeritem_player ){
+         view_id = localplayer.playermodel_view_slot;
+         addon_type = k_addon_type_player;
+      }
+      else 
+         assert(0);
 
-      netmsg_playeritem *item = 
-         alloca( sizeof(netmsg_playeritem) + ADDON_UID_MAX );
-      item->inetmsg_id = k_inetmsg_playeritem;
-      item->type = type;
-      item->client = 0;
+      struct addon_cache *cache = &addon_system.cache[addon_type];
+      vg_pool *pool = &cache->pool;
 
       SDL_AtomicLock( &addon_system.sl_cache_using_resources );
-      addon_cache_entry *entry = vg_pool_item( pool, id );
+      addon_cache_entry *entry = vg_pool_item( pool, view_id );
       addon_alias_uid( &entry->reg_ptr->alias, item->uid );
       SDL_AtomicUnlock( &addon_system.sl_cache_using_resources );
+   }
 
-      vg_info( "send equip: [%u] %s\n", 
-               item->type, item->uid );
+   vg_info( "send equip: [%u] %s\n", 
+            item->type_index, item->uid );
+   u32 chs = strlen(item->uid);
 
-      u32 chs = strlen(item->uid);
+   SteamAPI_ISteamNetworkingSockets_SendMessageToConnection(
+         hSteamNetworkingSockets, network_client.remote, 
+         item, sizeof(netmsg_playeritem)+chs+1,
+         k_nSteamNetworkingSend_Reliable, NULL );
 
-      SteamAPI_ISteamNetworkingSockets_SendMessageToConnection(
-            hSteamNetworkingSockets, network_client.remote, 
-            item, sizeof(netmsg_playeritem)+chs+1,
-            k_nSteamNetworkingSend_Reliable, NULL );
-   }
 }
 
 static void network_disconnect(void){
@@ -219,8 +242,10 @@ static void on_server_connect_status( CallbackMsg_t *msg ){
                k_nSteamNetworkingSend_Reliable, NULL );
 
          network_send_username();
-         network_send_item( k_addon_type_board );
-         network_send_item( k_addon_type_player );
+
+         for( u32 i=0; i<k_netmsg_playeritem_max; i ++ ){
+            network_send_item(i);
+         }
       }
       else if( info->m_info.m_eState == 
             k_ESteamNetworkingConnectionState_ClosedByPeer ){
@@ -354,9 +379,10 @@ static void network_update(void){
       poll_remote_connection();
       f64 frame_delta = vg.time_real - network_client.last_frame;
 
-      if( frame_delta > 0.1 ){
+      if( frame_delta > NETWORK_FRAMERATE ){
          network_client.last_frame = vg.time_real;
          remote_player_send_playerframe();
+         player__clear_sfx_buffer();
       }
 
       remote_player_debug_update();