X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=player_remote.c;h=8ab15e0a382de43d5c4b820c04d3b232da0441d2;hb=137d40d96fe923600d8378b8e138e3c276f27ff4;hp=d1bb149d7d70140455a8e0cc19986896a80e1963;hpb=5fba3602f053116a8e3849bc12c03198d6d7461c;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/player_remote.c b/player_remote.c
index d1bb149..8ab15e0 100644
--- a/player_remote.c
+++ b/player_remote.c
@@ -1,17 +1,63 @@
 #include "player_remote.h"
+#include "skeleton.h"
+#include "player_render.h"
+#include "network_common.h"
+#include "addon.h"
+#include "font.h"
+#include "gui.h"
 
-static void player_remote_unwatch( struct network_player *player ){
+static i32 k_show_own_name = 0;
+
+static void player_remote_clear( struct network_player *player ){
    addon_cache_unwatch( k_addon_type_player, player->playermodel_view_slot );
    addon_cache_unwatch( k_addon_type_board, player->board_view_slot );
-}
 
-static void player_remote_clear( struct network_player *player ){
-   player_remote_unwatch( player );
    memset( player, 0, sizeof(*player) );
    strcpy( player->username, "unknown" );
    player->subsystem = k_player_subsystem_invalid;
 }
 
+/* 
+ * re-attatches addon_reg pointers on the remote client if we have the same
+ * world loaded.
+ */
+static void relink_remote_player_worlds( u32 client_id ){
+   struct network_player *player = &netplayers.list[client_id];
+
+   addon_alias q[2];
+   addon_uid_to_alias( player->items[k_netmsg_playeritem_world0], &q[0] );
+   addon_uid_to_alias( player->items[k_netmsg_playeritem_world1], &q[1] );
+
+   /*
+    * currently in 10.23, the hub world will always be the same.
+    * this might but probably wont change in the future
+    */
+   for( u32 i=0; i<k_world_max; i++ ){
+      addon_reg *reg = world_static.instance_addons[ i ];
+
+      player->world_match[i] = 0;
+
+      if( reg ){
+         if( addon_alias_eq( &q[i], &world_static.instance_addons[i]->alias ) )
+            player->world_match[i] = 1;
+      }
+   }
+}
+
+/* 
+ * re-attatches addon_reg pointers on the remote client if we have the mod 
+ * installed locally.
+ *
+ * Run if local worlds change
+ */
+static void relink_all_remote_player_worlds(void){
+   for( u32 i=0; i<vg_list_size(netplayers.list); i++ ){
+      struct network_player *player = &netplayers.list[i];
+      if( player->active )
+         relink_remote_player_worlds(i);
+   }
+}
+
 static void player_remote_rx_200_300( SteamNetworkingMessage_t *msg ){
    netmsg_blank *tmp = msg->m_pData;
 
@@ -28,10 +74,13 @@ static void player_remote_rx_200_300( SteamNetworkingMessage_t *msg ){
          player->board_view_slot = 0;
          player->playermodel_view_slot = 0;
 
-         vg_strncpy( playerjoin->username, player->username, 
-                     sizeof(player->username), k_strncpy_always_add_null );
+         struct interp_buffer *buf = &netplayers.interp_data[playerjoin->index];
+         buf->t = -99999999.9;
+         for( u32 i=0; i<vg_list_size(buf->frames); i ++ ){
+            buf->frames[i].active = 0;
+         }
 
-         vg_info( "#%u joined with name: %s\n", player->username );
+         vg_info( "#%u joined\n", playerjoin->index );
       }
       else {
          vg_error( "inetmsg_playerjoin: player index out of range\n" );
@@ -43,7 +92,7 @@ static void player_remote_rx_200_300( SteamNetworkingMessage_t *msg ){
       
       if( playerleave->index < vg_list_size(netplayers.list) ){
          struct network_player *player = &netplayers.list[ playerleave->index ];
-         player_remote_unwatch( player );
+         player_remote_clear( player );
          player->active = 0;
          vg_info( "player leave (%d)\n", playerleave->index );
       }
@@ -57,18 +106,274 @@ static void player_remote_rx_200_300( SteamNetworkingMessage_t *msg ){
 
       if( update->index < vg_list_size(netplayers.list) ){
          struct network_player *player = &netplayers.list[ update->index ];
-         vg_strncpy( update->username, player->username, 
-                     sizeof(player->username), k_strncpy_always_add_null );
 
-         vg_info( "#%u changed username: %s\n", player->username );
+         network_msgstring( update->name, msg->m_cbSize, sizeof(*update),
+                            player->username, sizeof(player->username) );
+
+         vg_info( "#%u changed username to: %s\n", 
+                  update->index, player->username );
       }
       else {
          vg_error( "inetmsg_playerleave: player index out of range\n" );
       }
    }
+   else if( tmp->inetmsg_id == k_inetmsg_playerframe ){
+      u32 datasize = msg->m_cbSize - sizeof(netmsg_playerframe);
+      
+      if( datasize > sizeof(union interp_animdata) ){
+         vg_error( "Player frame data exceeds animdata size\n" );
+         return;
+      }
+      
+      netmsg_playerframe *frame = msg->m_pData;
+      if( frame->client >= vg_list_size(netplayers.list) ){
+         vg_error( "inetmsg_playerframe: player index out of range\n" );
+         return;
+      }
+
+      if( frame->subsystem >= k_player_subsystem_max ){
+         vg_error( "inetmsg_playerframe: subsystem out of range\n" );
+         return;
+      }
+
+      struct interp_buffer *ib = &netplayers.interp_data[ frame->client ];
+      struct interp_frame *dest = NULL;
+
+      f64 min_time = INFINITY;
+      for( u32 i=0; i<vg_list_size(ib->frames); i++ ){
+         struct interp_frame *ifr = &ib->frames[i];
+
+         if( !ifr->active ){
+            dest = ifr;
+            break;
+         }
+
+         if( ifr->timestamp < min_time ){
+            min_time = ifr->timestamp;
+            dest = ifr;
+         }
+      }
+
+      dest->active = 1;
+      dest->subsystem = frame->subsystem;
+      dest->instance_id = frame->instance_id;
+
+      bitpack_ctx ctx = {
+         .mode = k_bitpack_decompress,
+         .buffer = frame->animdata,
+         .buffer_len = datasize,
+         .bytes = 0,
+      };
+         
+
+      /* sfx
+       * -------------------------------------------------------------*/
+      
+      for( u32 i=0; i<frame->sound_effects; i ++ ){
+         struct net_sfx sfx;
+         net_sfx_exchange( &ctx, &sfx );
+
+         f64 t = (frame->timestamp - NETWORK_FRAMERATE) + 
+                 (sfx.subframe*NETWORK_FRAMERATE);
+
+         f32 remaining = t - ib->t;
+
+         if( remaining <= 0.0f )
+            net_sfx_play( &sfx );
+         else{
+            struct net_sfx *dst = NULL;
+
+            for( u32 j=0; j<NETWORK_SFX_QUEUE_LENGTH; j ++ ){
+               struct net_sfx *sj = &netplayers.sfx_queue[j];
+               if( sj->system == k_player_subsystem_invalid ){
+                  dst = sj;
+                  break;
+               }
+
+               if( sj->priority < sfx.priority )
+                  dst = sj;
+            }
+
+            *dst = sfx;
+            dst->subframe = remaining;
+         }
+      }
+      
+      /* animation 
+       * -------------------------------------------------------------*/
+
+      dest->timestamp = frame->timestamp;
+      dest->boundary_hash = frame->boundary_hash;
+
+      struct network_player *player = &netplayers.list[ frame->client ];
+      struct player_subsystem_interface *sys = 
+         player_subsystems[ frame->subsystem ];
+
+      if( sys->network_animator_exchange ){
+         memset( &dest->data, 0, sys->animator_size );
+         sys->network_animator_exchange( &ctx, &dest->data );
+      }
+      else {
+         bitpack_bytes( &ctx, sys->animator_size, sys->animator_data );
+      }
+
+      player->subsystem = frame->subsystem;
+      player->down_bytes += msg->m_cbSize;
+   }
+   else if( tmp->inetmsg_id == k_inetmsg_playeritem ){
+      netmsg_playeritem *item = msg->m_pData;
+      if( !packet_minsize( msg, sizeof(*item)+1 )) return;
+
+      if( item->client >= vg_list_size(netplayers.list) ){
+         vg_error( "inetmsg_playerframe: player index out of range\n" );
+         return;
+      }
+
+      if( item->type_index >= k_netmsg_playeritem_max ){
+         vg_warn( "Client #%d invalid equip type %u\n", 
+                  (i32)item->client, (u32)item->type_index );
+         return;
+      }
+
+      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 );
+
+      struct network_player *player = &netplayers.list[ item->client ];
+      char *uid = player->items[ item->type_index ];
+
+      network_msgstring( item->uid, msg->m_cbSize, sizeof(*item),
+                         uid, ADDON_UID_MAX );
+
+      if( item->type_index == k_netmsg_playeritem_board ){
+         addon_cache_unwatch( k_addon_type_board, player->board_view_slot );
+         player->board_view_slot = 
+            addon_cache_create_viewer_from_uid( k_addon_type_board, uid );
+      }
+      else if( item->type_index == k_netmsg_playeritem_player ){
+         addon_cache_unwatch( k_addon_type_player, 
+                              player->playermodel_view_slot );
+         player->playermodel_view_slot =
+            addon_cache_create_viewer_from_uid( k_addon_type_player, uid );
+      }
+      else if( (item->type_index == k_netmsg_playeritem_world0) ||
+               (item->type_index == k_netmsg_playeritem_world1) ){
+         relink_remote_player_worlds( item->client );
+      }
+   }
+}
+
+/*
+ * Write localplayer pose to network
+ */
+static void remote_player_send_playerframe(void){
+   u8 sysid = localplayer.subsystem;
+   if( sysid >= k_player_subsystem_max ) return;
+
+   struct player_subsystem_interface *sys = player_subsystems[sysid];
+
+   if( sys->animator_size ){
+      u32 max_buf_size = sys->animator_size + sizeof(localplayer.sfx_buffer),
+          base_size = sizeof(struct netmsg_playerframe),
+          max_packet = base_size + max_buf_size;
+
+      netmsg_playerframe *frame = alloca( max_packet );
+      frame->inetmsg_id = k_inetmsg_playerframe;
+      frame->client = 0xff;
+      frame->subsystem = localplayer.subsystem;
+      frame->instance_id = world_static.active_instance;
+
+      bitpack_ctx ctx = {
+         .mode = k_bitpack_compress,
+         .buffer = frame->animdata,
+         .buffer_len = max_buf_size,
+         .bytes = 0
+      };
+
+      /* sfx
+       * ---------------------------------------------*/
+
+      frame->sound_effects = localplayer.sfx_buffer_count;
+      for( u32 i=0; i<localplayer.sfx_buffer_count; i ++ )
+         net_sfx_exchange( &ctx, &localplayer.sfx_buffer[i] );
+
+      /* animation 
+       * -----------------------------------------------*/
+
+      frame->timestamp = vg.time_real;
+      frame->boundary_hash = localplayer.boundary_hash;
+      if( sys->network_animator_exchange )
+         sys->network_animator_exchange( &ctx, sys->animator_data );
+      else
+         bitpack_bytes( &ctx, sys->animator_size, sys->animator_data );
+
+      u32 wire_size = base_size + ctx.bytes;
+      netplayers.up_bytes += wire_size;
+
+      SteamAPI_ISteamNetworkingSockets_SendMessageToConnection(
+            hSteamNetworkingSockets, network_client.remote, 
+            frame, wire_size,
+            k_nSteamNetworkingSend_Unreliable, NULL );
+   }
+}
+
+/*
+ * Updates network traffic stats
+ */
+static void remote_player_debug_update(void){
+   if( (vg.time_real - netplayers.last_data_measurement) > 1.0 ){
+      netplayers.last_data_measurement = vg.time_real;
+      u32 total_down = 0;
+
+      for( u32 i=0; i<vg_list_size(netplayers.list); i++ ){
+         struct network_player *player = &netplayers.list[i];
+         if( player->active ){
+            total_down += player->down_bytes;
+            player->down_kbs = ((f32)player->down_bytes)/1024.0f;
+            player->down_bytes = 0;
+         }
+      }
+
+      netplayers.down_kbs = ((f32)total_down)/1024.0f;
+      netplayers.up_kbs = ((f32)netplayers.up_bytes)/1024.0f;
+      netplayers.up_bytes = 0;
+   }
 }
 
-static void remote_player_network_imgui(void){
+static void remote_player_nametag( m4x4f pv, v3f co, const char *name ){
+   return;
+   vg_ui.font = &vg_ui_font_big;
+   v4f wpos;
+   v3_copy( co, wpos );
+   wpos[1] += 2.0f;
+   wpos[3] = 1.0f;
+
+   m4x4_mulv( pv, wpos, wpos );
+
+   if( wpos[3] > 0.0f ){
+      v2_muls( wpos, (1.0f/wpos[3]) * 0.5f, wpos );
+      v2_add( wpos, (v2f){ 0.5f, 0.5f }, wpos );
+      
+      ui_rect wr;
+      wr[0] = vg_clampf(wpos[0] * vg.window_x, -32000.0f,32000.0f)-150;
+      wr[1] = vg_clampf((1.0f-wpos[1]) * vg.window_y,
+                        -32000.0f,32000.0f);
+      wr[2] = 300;
+      wr[3] = 32;
+      ui_fill( wr, (ui_colour(k_ui_bg)&0x00ffffff)|0x50000000 );
+      ui_text( wr, name, 1, k_ui_align_middle_center, 0 );
+   }
+   vg_ui.font = &vg_ui_font_small;
+}
+
+/*
+ * Debugging information
+ */
+static void remote_player_network_imgui( m4x4f pv ){
    if( !network_client.network_info ) 
       return;
 
@@ -81,7 +386,12 @@ static void remote_player_network_imgui(void){
    struct { enum ESteamNetworkingConnectionState state; const char *str; }
    states[] = {
 	   { k_ESteamNetworkingConnectionState_None, "None" },
-	   { k_ESteamNetworkingConnectionState_Connecting, "Connecting" },
+	   { k_ESteamNetworkingConnectionState_Connecting, 
+         (const char *[]){"Connecting -",
+                          "Connecting /",
+                          "Connecting |",
+                          "Connecting \\",
+                          }[(u32)(vg.time_real/0.25) & 0x3 ] },
 	   { k_ESteamNetworkingConnectionState_FindingRoute, "Finding Route" },
 	   { k_ESteamNetworkingConnectionState_Connected, "Connected" },
 	   { k_ESteamNetworkingConnectionState_ClosedByPeer, "Closed by peer" },
@@ -100,19 +410,264 @@ static void remote_player_network_imgui(void){
    snprintf( buf, 512, "Network: %s", netstatus );
    ui_info( panel, buf );
    ui_info( panel, "---------------------" );
-   ui_info( panel, "#-1: localplayer" );
 
-   for( u32 i=0; i<vg_list_size(netplayers.list); i++ ){
+   if( network_client.state == k_ESteamNetworkingConnectionState_Connected ){
+      ui_info( panel, "#-1: localplayer" );
+      
+      snprintf( buf, 512, "U%.3f/D%.3fkbs", 
+                netplayers.up_kbs, netplayers.down_kbs );
+      ui_info( panel, buf );
+
+      for( u32 i=0; i<vg_list_size(netplayers.list); i++ ){
+         struct network_player *player = &netplayers.list[i];
+         if( player->active ){
+            const char *sysname = "invalid";
+
+            if( player->subsystem < k_player_subsystem_max ){
+               sysname = player_subsystems[ player->subsystem ]->name;
+            }
+            snprintf( buf, 512, "#%u: %s [%s] D%.1fkbs", 
+                      i, player->username, sysname, player->down_kbs );
+            ui_info( panel, buf );
+
+            struct player_avatar *av = localplayer.playeravatar;
+            remote_player_nametag( 
+                  pv, 
+                  netplayers.final_mtx[av->sk.bone_count*i][3], 
+                  player->username );
+         }
+      }
+   }
+   else {
+      ui_info( panel, "offline" );
+   }
+
+   struct player_avatar *av = localplayer.playeravatar;
+   remote_player_nametag( 
+         pv, 
+         localplayer.final_mtx[0][3], 
+         "Localplayer" );
+}
+
+/*
+ * write the remote players final_mtx 
+ */
+static void pose_remote_player( u32 index, 
+                                struct interp_frame *f0,
+                                struct interp_frame *f1 ){
+
+   struct network_player *player = &netplayers.list[ index ];
+
+   struct interp_buffer *buf = &netplayers.interp_data[ index ];
+   struct player_avatar *av = localplayer.playeravatar;
+   m4x3f *final_mtx = &netplayers.final_mtx[ av->sk.bone_count*index ];
+   struct player_board_pose *board_pose = &netplayers.board_poses[index];
+
+   struct player_subsystem_interface *sys0 = player_subsystems[f0->subsystem],
+                                     *sys1 = NULL;
+
+   player_pose pose0, pose1, posed;
+   sys0->pose( &f0->data, &pose0 );
+
+   u8 instance_id = 0;
+
+   if( f1 ){
+      f32 t = (buf->t - f0->timestamp) / (f1->timestamp - f0->timestamp);
+          t = vg_clampf( t, 0.0f, 1.0f );
+
+      sys1 = player_subsystems[f1->subsystem];
+      sys1->pose( &f1->data, &pose1 );
+
+      u16 bounds = f0->boundary_hash^f1->boundary_hash;
+
+      if( bounds & NETMSG_BOUNDARY_BIT )
+         t = 1.0f;
+
+      if( bounds & NETMSG_GATE_BOUNDARY_BIT ){
+         /* TODO: Extra work retransforming the root_co, instance_id.. etc */
+         t = 1.0f;
+      }
+
+      instance_id = f1->instance_id;
+
+      lerp_player_pose( &pose0, &pose1, t, &posed );
+      apply_full_skeleton_pose( &av->sk, &posed, final_mtx );
+      memcpy( board_pose, &posed.board, sizeof(*board_pose) );
+   }
+   else {
+      instance_id = f0->instance_id;
+
+      apply_full_skeleton_pose( &av->sk, &pose0, final_mtx );
+      memcpy( board_pose, &pose0.board, sizeof(*board_pose) );
+   }
+
+   if( player->world_match[ instance_id ] )
+      player->active_world = &world_static.instances[ instance_id ];
+}
+
+/* 
+ * animate remote player and store in final_mtx
+ */
+static void animate_remote_player( u32 index ){
+
+   /*
+    * Trys to keep the cursor inside the buffer
+    */
+   f64 min_time = -999999999.9,
+       max_time =  999999999.9,
+       abs_max_time = -999999999.9;
+
+   struct interp_frame *minframe = NULL,
+                       *maxframe = NULL,
+                       *abs_max_frame = NULL;
+
+   struct interp_buffer *buf = &netplayers.interp_data[index];
+   for( u32 i=0; i<vg_list_size(buf->frames); i ++ ){
+      struct interp_frame *ifr = &buf->frames[i];
+
+      if( ifr->active ){
+         if( (ifr->timestamp > min_time) && (ifr->timestamp < buf->t) ){
+            min_time = ifr->timestamp;
+            minframe = ifr;
+         }
+
+         if( (ifr->timestamp < max_time) && (ifr->timestamp > buf->t) ){
+            max_time = ifr->timestamp;
+            maxframe = ifr;
+         }
+
+         if( ifr->timestamp > abs_max_time ){
+            abs_max_time = ifr->timestamp;
+            abs_max_frame = ifr;
+         }
+      }
+   }
+
+   struct network_player *player = &netplayers.list[ index ];
+   player->active_world = NULL;
+   
+   if( minframe && maxframe ){
+      pose_remote_player( index, minframe, maxframe );
+      buf->t += vg.time_frame_delta;
+   }
+   else {
+      buf->t = abs_max_time - 0.25;
+
+      if( abs_max_frame )
+         pose_remote_player( index, abs_max_frame, NULL );
+      else 
+         return;
+   }
+}
+
+/*
+ * Update full final_mtx for all remote players
+ */
+static void animate_remote_players(void){
+   for( u32 i=0; i<vg_list_size(netplayers.list); i ++ ){
+      struct network_player *player = &netplayers.list[i];
+      if( !player->active ) continue;
+
+      animate_remote_player( i );
+   }
+}
+
+/*
+ * Draw remote players
+ */
+static void render_remote_players( world_instance *world, camera *cam ){
+   SDL_AtomicLock( &addon_system.sl_cache_using_resources );
+
+   for( u32 i=0; i<NETWORK_MAX_PLAYERS; i ++ ){
+      struct network_player *player = &netplayers.list[i];
+      if( !player->active ) continue;
+      if( player->active_world != world ) continue;
+      
+      struct player_avatar *av = localplayer.playeravatar;
+      m4x3f *final_mtx = &netplayers.final_mtx[ av->sk.bone_count*i ];
+
+      struct player_model *model = 
+         addon_cache_item_if_loaded( k_addon_type_player, 
+                                     player->playermodel_view_slot );
+
+      if( !model ) model = &localplayer.fallback_model;
+      render_playermodel( cam, world, 0, model, &av->sk, final_mtx );
+
+      struct player_board *board = 
+         addon_cache_item_if_loaded( k_addon_type_board,
+                                     player->board_view_slot );
+      render_board( cam, world, board, 
+                     final_mtx[localplayer.playeravatar->id_board],
+                     &netplayers.board_poses[ i ],
+                     k_board_shader_player );
+   }
+
+   SDL_AtomicUnlock( &addon_system.sl_cache_using_resources );
+}
+
+static void render_remote_player_nametag( v3f co, const char *name ){
+   m4x3f mlocal;
+   m4x3_identity( mlocal );
+   mlocal[3][0] -= font3d_string_width( 2, name ) * 0.5f;
+
+   m4x3f mmdl;
+   m3x3_identity( mmdl );
+   for( int i=0; i<3; i++ )
+      v3_muls( skaterift.cam.mtx.v[i], 0.2f, mmdl[i] );
+   m3x3_transpose( mmdl, mmdl );
+   v3_add( co, (v3f){0.0f,2.0f,0.0f}, mmdl[3] );
+
+   m4x3_mul( mmdl, mlocal, mmdl );
+   font3d_simple_draw( 2, name, &skaterift.cam, mmdl );
+}
+
+static void render_remote_players_tags( world_instance *world, camera *cam ){
+   glEnable(GL_BLEND);
+   glEnable(GL_DEPTH_TEST);
+   glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA );
+   glBlendEquation(GL_FUNC_ADD);
+
+   font3d_bind( &gui.font, k_font_shader_default, 1, NULL, &skaterift.cam );
+   font3d_setcolour( (v4f){1.0f,1.0f,1.0f,1.0f} );
+
+   if( k_show_own_name ){
+      render_remote_player_nametag( 
+            localplayer.final_mtx[0][3], 
+            steam_username_at_startup );
+   }
+
+   for( u32 i=0; i<NETWORK_MAX_PLAYERS; i ++ ){
       struct network_player *player = &netplayers.list[i];
-      if( player->active ){
-         const char *sysname = "invalid";
+      if( !player->active ) continue;
+      if( player->active_world != world ) continue;
+
+      struct player_avatar *av = localplayer.playeravatar;
+      render_remote_player_nametag( 
+            netplayers.final_mtx[av->sk.bone_count*i][3], 
+            player->username );
+   }
+
+   glDisable(GL_BLEND);
+}
+
+static void remote_players_init(void){
+   vg_console_reg_var( "k_show_own_name", &k_show_own_name, 
+                       k_var_dtype_i32, 0 );
+   for( u32 i=0; i<NETWORK_SFX_QUEUE_LENGTH; i ++ ){
+      netplayers.sfx_queue[i].system = k_player_subsystem_invalid;
+   }
+}
+
+static void remote_sfx_pre_update(void){
+   for( u32 i=0; i<NETWORK_SFX_QUEUE_LENGTH; i ++ ){
+      struct net_sfx *si = &netplayers.sfx_queue[i];
 
-         if( (player->subsystem >= 0) && 
-             (player->subsystem < k_player_subsystem_max) ){
-            sysname = player_subsystems[ player->subsystem ]->name;
+      if( si->system != k_player_subsystem_invalid ){
+         si->subframe -= vg.time_frame_delta;
+         if( si->subframe <= 0.0f ){
+            net_sfx_play( si );
+            si->system = k_player_subsystem_invalid;
          }
-         snprintf( buf, 512, "#%u: %s [%s]", i, player->username, sysname );
-         ui_info( panel, buf );
       }
    }
 }