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

diff --git a/network.h b/network.h
index b6cb566..b47f518 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,22 +14,22 @@
 /* 
  * Interface
  */
-#define SR_USE_LOCALHOST
+//#define SR_USE_LOCALHOST
 
 /* Call it at start; Connects us to the gameserver */
-static void network_init(void);
+VG_STATIC void network_init(void);
 
 /* Run this from main loop */
-static void network_update(void);
+VG_STATIC void network_update(void);
 
 /* Call it at shutdown */
-static void network_end(void);
+VG_STATIC void network_end(void*_);
 
 /* 
  * Can buffer up a bunch of these by calling many times, they will be
  * sent at the next connection 
  */
-static void network_submit_highscore( u32 trackid, u16 points, u16 time );
+VG_STATIC void network_submit_highscore( u32 trackid, u16 points, u16 time );
 
 /*
  * Game endpoints are provided with the same names to allow running without a
@@ -35,21 +40,21 @@ static void network_submit_highscore( u32 trackid, u16 points, u16 time );
 /* 
  * Runtime connection stuff
  */
-static u8 steam_app_ticket[ 1024 ];
-static u32 steam_app_ticket_length;
-static int network_name_update = 1;
+VG_STATIC u8 steam_app_ticket[ 1024 ];
+VG_STATIC u32 steam_app_ticket_length;
+VG_STATIC int network_name_update = 1;
 
-static HSteamNetConnection cremote;
-static ESteamNetworkingConnectionState cremote_state = 
+VG_STATIC HSteamNetConnection cremote;
+VG_STATIC ESteamNetworkingConnectionState cremote_state = 
      k_ESteamNetworkingConnectionState_None;
 
 /* 
  * Implementation
  */
 
-static void scores_update(void);
+VG_STATIC void scores_update(void);
 
-static void on_auth_ticket_recieved( void *result, void *context )
+VG_STATIC void on_auth_ticket_recieved( void *result, void *context )
 {
    EncryptedAppTicketResponse_t *response = result;
 
@@ -77,7 +82,7 @@ static void on_auth_ticket_recieved( void *result, void *context )
    }
 }
 
-static void request_auth_ticket(void)
+VG_STATIC void request_auth_ticket(void)
 {
    /* 
     * TODO Check for one thats cached on the disk and load it.
@@ -92,7 +97,7 @@ static void request_auth_ticket(void)
                                                               NULL, 0 );
 }
 
-static void send_auth_ticket(void)
+VG_STATIC void send_auth_ticket(void)
 {
    u32 size = sizeof(netmsg_auth) + steam_app_ticket_length;
    netmsg_auth *auth = alloca(size);
@@ -107,7 +112,7 @@ static void send_auth_ticket(void)
          k_nSteamNetworkingSend_Reliable, NULL );
 }
 
-static void send_score_request(void)
+VG_STATIC void send_score_request(void)
 {
    vg_info( "Requesting scores\n" );
    netmsg_scores_request req;
@@ -118,32 +123,56 @@ static void send_score_request(void)
          k_nSteamNetworkingSend_Reliable, NULL );
 }
 
-static void send_score_update(void)
+VG_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 );
 }
 
-static void send_nickname(void)
+VG_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),
@@ -152,7 +181,7 @@ static void send_nickname(void)
    network_name_update = 0;
 }
 
-static void server_routine_update(void)
+VG_STATIC void server_routine_update(void)
 {
    send_auth_ticket();
 
@@ -163,7 +192,7 @@ static void server_routine_update(void)
    send_score_request();
 }
 
-static void on_server_connect_status( CallbackMsg_t *msg )
+VG_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 );
@@ -187,7 +216,7 @@ static void on_server_connect_status( CallbackMsg_t *msg )
    }
 }
 
-static void network_connect_gc(void)
+VG_STATIC void network_connect_gc(void)
 {
    /* Connect to server if not connected */
    SteamNetworkingIPAddr remoteAddr;
@@ -207,7 +236,7 @@ static void network_connect_gc(void)
                   hSteamNetworkingSockets, &remoteAddr, 0, NULL );
 }
 
-static void on_inet_scoreboard( SteamNetworkingMessage_t *msg )
+VG_STATIC void on_inet_scoreboard( SteamNetworkingMessage_t *msg )
 {
    netmsg_scoreboard *sb = msg->m_pData;
 
@@ -239,9 +268,11 @@ 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)
+VG_STATIC void poll_connection(void)
 {
    SteamNetworkingMessage_t *messages[32];
    int len;
@@ -277,16 +308,16 @@ static void poll_connection(void)
 /*
  * Subroutine to be connected to main game loop, runs all routines on timers
  */
-static void network_update(void)
+VG_STATIC void network_update(void)
 {
    if( steam_ready )
    {
       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" );
@@ -308,7 +339,7 @@ static void network_update(void)
    }
 }
 
-static void network_init(void)
+VG_STATIC void network_init(void)
 {
    if( steam_ready )
    {
@@ -318,7 +349,7 @@ static void network_init(void)
    }
 }
 
-static void network_end(void)
+VG_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 */
+
+VG_STATIC void network_init(void){}
+VG_STATIC void network_update(void){}
+VG_STATIC void network_end(void*_){}
+
+#endif /* SR_NETWORKED */
 #endif /* NETWORK_H */