remote items test

[carveJwlIkooP6JGAAIwe30JlM.git] / network.c

diff --git a/network.c b/network.c
index 3235c697e84ee7359a9d9a3bd4c739fdd082d2a6..4768ece1a14ebcd32129b6e2f49e672f95313582 100644 (file)
--- a/network.c
+++ b/network.c
@@ -1,6 +1,7 @@
 #include "player.h"
 #include "network.h"
 #include "network_msg.h"
+#include "network_common.h"
 #include "player_remote.h"
 
 static void scores_update(void);
@@ -131,21 +132,55 @@ static void server_routine_update(void){
 #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 );
@@ -184,6 +219,8 @@ 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 );
       }
       else if( info->m_info.m_eState == 
             k_ESteamNetworkingConnectionState_ClosedByPeer ){