X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=network.h;h=e06027aa88b97cc7d56154dc3e3a4c0d74a133f3;hb=15beb60ade240af4e00b0d204f7e89a4d35dca36;hp=b6cb5660e497e36d28e161794a06d2601b04c2de;hpb=89032d64e2867adb66e4598a0c66d3e853a22bb0;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/network.h b/network.h
index b6cb566..e06027a 100644
--- a/network.h
+++ b/network.h
@@ -1,3 +1,8 @@
+/*
+ * Copyright (C) 2021-2022 Mt.ZERO Software, Harry Godden - All Rights Reserved
+ * All trademarks are property of their respective owners
+ */
+
 #ifndef NETWORK_H
 #define NETWORK_H
 
@@ -9,7 +14,7 @@
 /* 
  * Interface
  */
-#define SR_USE_LOCALHOST
+//#define SR_USE_LOCALHOST
 
 /* Call it at start; Connects us to the gameserver */
 static void network_init(void);
@@ -18,7 +23,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 +127,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 );
 }
 
@@ -142,8 +171,8 @@ static void send_nickname(void)
    netmsg_set_nickname nick;
    nick.inetmsg_id = k_inetmsg_set_nickname;
 
-   memset( nick.nickname, 0, 10 );
-   strcpy( nick.nickname, "real H" );
+   memset( nick.nickname, 0, 16 );
+   vg_strncpy( steam_username_at_startup, nick.nickname, 16 );
    
    SteamAPI_ISteamNetworkingSockets_SendMessageToConnection(
          hSteamNetworkingSockets, cremote, &nick, sizeof(netmsg_set_nickname),
@@ -239,6 +268,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)
@@ -284,9 +315,9 @@ static void network_update(void)
       static double last_update = 0.0;
       poll_connection();
       
-      if( vg_time > (last_update + 60.0) )
+      if( vg.time > (last_update + 60.0) )
       {
-         last_update = vg_time;
+         last_update = vg.time;
 
          if( steam_app_ticket_length )
          {
@@ -294,11 +325,11 @@ 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" );
          }
       }
 
-      if( vg_time > (last_update + 10.0) && 
+      if( vg.time > (last_update + 10.0) && 
             (cremote_state == k_ESteamNetworkingConnectionState_Connected ))
       {
          vg_warn( "Connected to server but no return... disconnecting\n" );
@@ -318,7 +349,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 ||
@@ -329,5 +360,11 @@ static void network_end(void)
    }
 }
 
-#endif
+#else /* SR_NETWORKED */
+
+static void network_init(void){}
+static void network_update(void){}
+static void network_end(void*_){}
+
+#endif /* SR_NETWORKED */
 #endif /* NETWORK_H */