#include "player.h"
#include "network.h"
#include "network_msg.h"
+#include "network_common.h"
#include "player_remote.h"
static void scores_update(void);
}
#endif
-static void network_send_playerframe(void){
- netmsg_playerframe frame;
- frame.inetmsg_id = k_inetmsg_playerframe;
- v3_copy( localplayer.rb.co, frame.pos_temp );
-
- SteamAPI_ISteamNetworkingSockets_SendMessageToConnection(
- hSteamNetworkingSockets, network_client.remote,
- &frame, sizeof(frame),
- k_nSteamNetworkingSend_Unreliable, NULL );
-}
-
#if 0
static void server_routine_update(void){
send_score_update();
#endif
static void network_send_username(void){
- netmsg_playerusername update;
- memset( &update, 0, sizeof(update) );
- update.inetmsg_id = k_inetmsg_playerusername;
- update.index = 0xffffffff;
+ netmsg_playerusername *update = alloca( sizeof(netmsg_playerusername)+
+ NETWORK_USERNAME_MAX );
+ update->inetmsg_id = k_inetmsg_playerusername;
+ update->index = 0xffffffff;
ISteamFriends *hSteamFriends = SteamAPI_SteamFriends();
const char *username = SteamAPI_ISteamFriends_GetPersonaName(hSteamFriends);
- str_utf8_collapse( username, update.username, sizeof(update.username) );
+ u32 chs = str_utf8_collapse( username, update->name, NETWORK_USERNAME_MAX );
SteamAPI_ISteamNetworkingSockets_SendMessageToConnection(
hSteamNetworkingSockets, network_client.remote,
- &update, sizeof(update),
+ update, sizeof(netmsg_playerusername)+chs+1,
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;
+
+ 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 = type;
+ item->client = 0;
+
+ SDL_AtomicLock( &addon_system.sl_cache_using_resources );
+ addon_cache_entry *entry = vg_pool_item( pool, 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 );
+
+ u32 chs = strlen(item->uid);
+
+ SteamAPI_ISteamNetworkingSockets_SendMessageToConnection(
+ hSteamNetworkingSockets, network_client.remote,
+ item, sizeof(netmsg_playeritem)+chs+1,
+ k_nSteamNetworkingSend_Reliable, NULL );
+ }
+}
+
+static void network_disconnect(void){
+ SteamAPI_ISteamNetworkingSockets_CloseConnection(
+ hSteamNetworkingSockets, network_client.remote, 0, NULL, 0 );
+ network_client.remote = 0;
+
+ for( int i=0; i<vg_list_size(netplayers.list); i++ ){
+ netplayers.list[i].active = 0;
+ }
+}
+
static void on_server_connect_status( CallbackMsg_t *msg ){
SteamNetConnectionStatusChangedCallback_t *info = (void *)msg->m_pubParam;
vg_info( " Connection status changed for %lu\n", info->m_hConn );
k_nSteamNetworkingSend_Reliable, NULL );
network_send_username();
+ network_send_item( k_addon_type_board );
+ network_send_item( k_addon_type_player );
}
else if( info->m_info.m_eState ==
k_ESteamNetworkingConnectionState_ClosedByPeer ){
k_ESteamNetConnectionEnd_Remote_Max ){
network_client.retries = 40;
}
-
- SteamAPI_ISteamNetworkingSockets_CloseConnection(
- hSteamNetworkingSockets, info->m_hConn, 0, NULL, 0 );
- network_client.remote = 0;
+ network_disconnect();
}
else if( info->m_info.m_eState ==
k_ESteamNetworkingConnectionState_ProblemDetectedLocally ){
- SteamAPI_ISteamNetworkingSockets_CloseConnection(
- hSteamNetworkingSockets, info->m_hConn, 0, NULL, 0 );
- network_client.remote = 0;
+ network_disconnect();
}
}
else{
PersonaStateChange_t *info = (void *)msg->m_pubParam;
ISteamUser *hSteamUser = SteamAPI_SteamUser();
+
+ vg_info( "User: %llu, change: %u\n", info->m_ulSteamID,
+ info->m_nChangeFlags );
+
if( info->m_ulSteamID == SteamAPI_ISteamUser_GetSteamID(hSteamUser) ){
- if( info->m_nChangeFlags == k_EPersonaChangeNickname ){
+ if( info->m_nChangeFlags & k_EPersonaChangeName ){
network_send_username();
}
}
const char *server_lon1 = "46.101.34.155:27402";
SteamAPI_SteamNetworkingIPAddr_ParseString( &remoteAddr, server_lon1 );
#endif
+ const char *server_lan = "192.168.1.32:27402";
+ SteamAPI_SteamNetworkingIPAddr_ParseString( &remoteAddr, server_lan );
char buf[256];
SteamAPI_SteamNetworkingIPAddr_ToString( &remoteAddr, buf, 256, 1 );
if( frame_delta > 0.1 ){
network_client.last_frame = vg.time_real;
- network_send_playerframe();
+ remote_player_send_playerframe();
}
+
+ remote_player_debug_update();
}
else {
if( (state == k_ESteamNetworkingConnectionState_Connecting) ||