fix pool error

diff --git a/gameserver.c b/gameserver.c
index c0eca6757e5958c47830097d6393a7402ef8c939..efc0bbfa72fde60adf25d95e93e5eb7ebf061279 100644 (file)
--- a/gameserver.c
+++ b/gameserver.c
@@ -377,7 +377,7 @@ static void gameserver_rx_200_300( SteamNetworkingMessage_t *msg ){
                          dest, ADDON_UID_MAX );
 
       vg_info( "Client #%d equiped: [%s] %s\n", 
-               item->client, 
+               client_id, 
                (const char *[]){[k_netmsg_playeritem_board]="board",
                                 [k_netmsg_playeritem_player]="player",
                                 [k_netmsg_playeritem_world0]="world0",

diff --git a/player_remote.c b/player_remote.c
index 62eed5a3c62b9cd115c9486a6a5d88ad913e9f08..888393b2ddc0763fa22fc5d9c9cd3b64b5220093 100644 (file)
--- a/player_remote.c
+++ b/player_remote.c
@@ -4,13 +4,10 @@
 #include "network_common.h"
 #include "addon.h"
 
-static void player_remote_unwatch( struct network_player *player ){
+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;
@@ -91,7 +88,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 );
       }