X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=network.h;h=10e85dc231314fffb46fe60a7727373b2d787e4e;hb=d13f2700b1773551307685cc7c34c804ccd6d664;hp=998a367a44b9eb04270288006d2475cb9c6a536f;hpb=d045af680c6b8ca267a7aded69e2e510e659d2ab;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/network.h b/network.h
index 998a367..10e85dc 100644
--- a/network.h
+++ b/network.h
@@ -18,7 +18,7 @@ static void network_init(void);
 static void network_update(void);
 
 /* Call it at shutdown */
-static void network_end(void);
+static void network_end(void*_);
 
 /* 
  * Can buffer up a bunch of these by calling many times, they will be
@@ -122,18 +122,42 @@ static void send_score_update(void)
 {
    vg_info( "Sending scores\n" );
    u32 size = sizeof(netmsg_set_score) + 
-                  1 * sizeof(struct netmsg_score_record);
-
+                  vg_list_size(track_infos)*sizeof(struct netmsg_score_record);
    netmsg_set_score *setscore = alloca( size );
    setscore->inetmsg_id = k_inetmsg_set_score;
-   setscore->record_count = 1;
-   setscore->records[0].trackid = 0;
-   setscore->records[0].playerid = 0;
-   setscore->records[0].points = 1386;
-   setscore->records[0].time = 19432;
+
+   int count = 0;
+   for( u32 i=0; i<vg_list_size(track_infos); i++ )
+   {
+      if( track_infos[i].push )
+      {
+         track_infos[i].push = 0;
+         highscore_record *user_record = highscore_find_user_record( 0, i );
+
+         if( !user_record )
+         {
+            vg_error( "No score set but tried to upload for track %u\n", i );
+            continue;
+         }
+
+         setscore->records[count].trackid = i;
+         setscore->records[count].playerid = 0;
+         setscore->records[count].points = user_record->points;
+         setscore->records[count].time = user_record->time;
+
+         count ++;
+      }
+   }
+
+   if( count == 0 )
+      return;
+
+   u32 send_size = sizeof(netmsg_set_score) +
+                  count*sizeof(struct netmsg_score_record);
+   setscore->record_count = count;
 
    SteamAPI_ISteamNetworkingSockets_SendMessageToConnection(
-         hSteamNetworkingSockets, cremote, setscore, size,
+         hSteamNetworkingSockets, cremote, setscore, send_size,
          k_nSteamNetworkingSend_Reliable, NULL );
 }
 
@@ -143,7 +167,7 @@ static void send_nickname(void)
    nick.inetmsg_id = k_inetmsg_set_nickname;
 
    memset( nick.nickname, 0, 10 );
-   strcpy( nick.nickname, "real H" );
+   strcpy( nick.nickname, "Harry" );
    
    SteamAPI_ISteamNetworkingSockets_SendMessageToConnection(
          hSteamNetworkingSockets, cremote, &nick, sizeof(netmsg_set_nickname),
@@ -239,6 +263,8 @@ static void on_inet_scoreboard( SteamNetworkingMessage_t *msg )
    /* We dont need to stay on the server currently */
    SteamAPI_ISteamNetworkingSockets_CloseConnection(
          hSteamNetworkingSockets, cremote, 0, NULL, 1 );
+
+   network_scores_updated = 1;
 }
 
 static void poll_connection(void)
@@ -294,7 +320,7 @@ static void network_update(void)
          }
          else
          {
-            vg_log( "Not making remote connection; app ticket not gotten\n" );
+            vg_low( "Not making remote connection; app ticket not gotten\n" );
          }
       }
 
@@ -318,7 +344,7 @@ static void network_init(void)
    }
 }
 
-static void network_end(void)
+static void network_end(void*_)
 {
    /* TODO: Fire off any buffered highscores that need to be setn */
    if( cremote_state == k_ESteamNetworkingConnectionState_Connected ||
@@ -331,9 +357,9 @@ static void network_end(void)
 
 #else /* SR_NETWORKED */
 
-static void network_init(void){}
+static int network_init(void){ return 1; }
 static void network_update(void){}
-static void network_end(void){}
+static void network_end(void*_){}
 
 #endif /* SR_NETWORKED */
 #endif /* NETWORK_H */