diff --git a/lsteamclient/unix_private.h b/lsteamclient/unix_private.h index 40fdfa29..1697e4d2 100644 --- a/lsteamclient/unix_private.h +++ b/lsteamclient/unix_private.h @@ -21,7 +21,7 @@ extern "C" #endif /* __cplusplus */ struct w_iface; -extern void queue_vtable_callback( struct w_iface *w_iface, enum callback_type type, uint64_t arg0, uint64_t arg1, uint64_t arg2 ); +extern void queue_vtable_callback( struct w_iface *w_iface, enum callback_type type, uint64_t arg0, uint64_t arg1 ); extern void queue_vtable_callback_0_server_responded( struct w_iface *w_iface, gameserveritem_t_105 *server ); extern void queue_vtable_callback_0_add_player_to_list( struct w_iface *w_iface, const char *pchName, int nScore, float flTimePlayed ); extern void queue_vtable_callback_0_rules_responded( struct w_iface *w_iface, const char *pchRule, const char *pchValue ); diff --git a/lsteamclient/unix_steam_networking_manual.cpp b/lsteamclient/unix_steam_networking_manual.cpp index 61bfe3ed..adf4e8dc 100644 --- a/lsteamclient/unix_steam_networking_manual.cpp +++ b/lsteamclient/unix_steam_networking_manual.cpp @@ -647,17 +647,17 @@ struct SteamMatchmakingServerListResponse_099u : u_ISteamMatchmakingServerListRe void SteamMatchmakingServerListResponse_099u::ServerResponded( int32_t iServer ) { - queue_vtable_callback( this->w_iface, CALL_IFACE_VTABLE_0_1, (intptr_t)iServer, 0, 0 ); + queue_vtable_callback( this->w_iface, CALL_IFACE_VTABLE_0_1, (intptr_t)iServer, 0 ); } void SteamMatchmakingServerListResponse_099u::ServerFailedToRespond( int32_t iServer ) { - queue_vtable_callback( this->w_iface, CALL_IFACE_VTABLE_1_1, (intptr_t)iServer, 0, 0 ); + queue_vtable_callback( this->w_iface, CALL_IFACE_VTABLE_1_1, (intptr_t)iServer, 0 ); } void SteamMatchmakingServerListResponse_099u::RefreshComplete( uint32_t response ) { - queue_vtable_callback( this->w_iface, CALL_IFACE_VTABLE_2_1, (intptr_t)response, 0, 0 ); + queue_vtable_callback( this->w_iface, CALL_IFACE_VTABLE_2_1, (intptr_t)response, 0 ); TRACE( "RefreshComplete this %p, w_iface %p.\n", this, this->w_iface ); } @@ -701,17 +701,17 @@ class callback_obj_tracker SteamMatchmak void SteamMatchmakingServerListResponse_106::ServerResponded( void *hRequest, int32_t iServer ) { - queue_vtable_callback( this->w_iface, CALL_IFACE_VTABLE_0_2, (intptr_t)hRequest, (intptr_t)iServer, 0 ); + queue_vtable_callback( this->w_iface, CALL_IFACE_VTABLE_0_2, (intptr_t)hRequest, (intptr_t)iServer ); } void SteamMatchmakingServerListResponse_106::ServerFailedToRespond( void *hRequest, int32_t iServer ) { - queue_vtable_callback( this->w_iface, CALL_IFACE_VTABLE_1_2, (intptr_t)hRequest, (intptr_t)iServer, 0 ); + queue_vtable_callback( this->w_iface, CALL_IFACE_VTABLE_1_2, (intptr_t)hRequest, (intptr_t)iServer ); } void SteamMatchmakingServerListResponse_106::RefreshComplete( void *hRequest, uint32_t response ) { - queue_vtable_callback( this->w_iface, CALL_IFACE_VTABLE_2_2, (intptr_t)hRequest, (intptr_t)response, 0 ); + queue_vtable_callback( this->w_iface, CALL_IFACE_VTABLE_2_2, (intptr_t)hRequest, (intptr_t)response ); TRACE( "RefreshComplete this %p, w_iface %p.\n", this, this->w_iface ); } @@ -744,7 +744,7 @@ void SteamMatchmakingPingResponse::ServerResponded( gameserveritem_t_105 *server void SteamMatchmakingPingResponse::ServerFailedToRespond(void) { - queue_vtable_callback( this->w_iface, CALL_IFACE_VTABLE_1_0, 0, 0, 0 ); + queue_vtable_callback( this->w_iface, CALL_IFACE_VTABLE_1_0, 0, 0 ); TRACE("Deleting this %p, w_iface %p.\n", this, this->w_iface); free_callback_obj(this); } @@ -776,14 +776,14 @@ void SteamMatchmakingPlayersResponse::AddPlayerToList(const char *pchName, int n void SteamMatchmakingPlayersResponse::PlayersFailedToRespond(void) { - queue_vtable_callback( this->w_iface, CALL_IFACE_VTABLE_1_0, 0, 0, 0 ); + queue_vtable_callback( this->w_iface, CALL_IFACE_VTABLE_1_0, 0, 0 ); TRACE("Deleting this %p, w_iface %p.\n", this, this->w_iface); free_callback_obj(this); } void SteamMatchmakingPlayersResponse::PlayersRefreshComplete(void) { - queue_vtable_callback( this->w_iface, CALL_IFACE_VTABLE_2_0, 0, 0, 0 ); + queue_vtable_callback( this->w_iface, CALL_IFACE_VTABLE_2_0, 0, 0 ); TRACE("Deleting this %p, w_iface %p.\n", this, this->w_iface); free_callback_obj(this); } @@ -815,14 +815,14 @@ void SteamMatchmakingRulesResponse::RulesResponded(const char *pchRule, const ch void SteamMatchmakingRulesResponse::RulesFailedToRespond(void) { - queue_vtable_callback( this->w_iface, CALL_IFACE_VTABLE_1_0, 0, 0, 0 ); + queue_vtable_callback( this->w_iface, CALL_IFACE_VTABLE_1_0, 0, 0 ); TRACE("Deleting this %p, w_iface %p.\n", this, this->w_iface); free_callback_obj(this); } void SteamMatchmakingRulesResponse::RulesRefreshComplete(void) { - queue_vtable_callback( this->w_iface, CALL_IFACE_VTABLE_2_0, 0, 0, 0 ); + queue_vtable_callback( this->w_iface, CALL_IFACE_VTABLE_2_0, 0, 0 ); TRACE("Deleting this %p, w_iface %p.\n", this, this->w_iface); free_callback_obj(this); } diff --git a/lsteamclient/unixlib.cpp b/lsteamclient/unixlib.cpp index 6b335a48..862c676c 100644 --- a/lsteamclient/unixlib.cpp +++ b/lsteamclient/unixlib.cpp @@ -43,7 +43,7 @@ static int callback_len_utow( int cb_id, int u_len ) return find_first_callback_def_by_id( cb_id )->w_callback_len; } -void queue_vtable_callback( struct w_iface *w_iface, enum callback_type type, uint64_t arg0, uint64_t arg1, uint64_t arg2 ) +void queue_vtable_callback( struct w_iface *w_iface, enum callback_type type, uint64_t arg0, uint64_t arg1 ) { struct callback_entry *entry; uint32_t size = 0; @@ -58,7 +58,6 @@ void queue_vtable_callback( struct w_iface *w_iface, enum callback_type type, ui entry->callback.call_iface_vtable.iface = w_iface; entry->callback.call_iface_vtable.arg0 = arg0; entry->callback.call_iface_vtable.arg1 = arg1; - entry->callback.call_iface_vtable.arg2 = arg2; pthread_mutex_lock( &callbacks_lock ); list_add_tail( &callbacks, &entry->entry ); diff --git a/lsteamclient/unixlib.h b/lsteamclient/unixlib.h index 5a1213ba..cab3fefb 100644 --- a/lsteamclient/unixlib.h +++ b/lsteamclient/unixlib.h @@ -89,7 +89,6 @@ struct callback struct w_iface *iface; uint64_t arg0; uint64_t arg1; - uint64_t arg2; } call_iface_vtable; struct