X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=network.h;h=83564f019f8ecb7347353c840569526f756c8759;hb=5bfb36032928ba9f8d12e72961af68bfab9ea648;hp=ef3455de14f77f873f8425a1e7d46405f57da949;hpb=cedb92d590f4578a246a09a96c0fa0eda109d3c7;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/network.h b/network.h
index ef3455d..83564f0 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
 
@@ -6,25 +11,27 @@
 #include "network_msg.h"
 #include "highscores.h"
 
+VG_STATIC int network_scores_updated = 0;
+
 /* 
  * 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,22 +42,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;
-static int network_scores_updated = 0;
+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;
 
@@ -78,7 +84,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.
@@ -86,14 +92,15 @@ static void request_auth_ticket(void)
     */
 
    vg_info( "Requesting new authorization ticket\n" );
-   steam_async *call = steam_new_async();
-   call->data = NULL;
+
+   vg_steam_async_call *call = vg_alloc_async_steam_api_call();
+   call->userdata = NULL;
    call->p_handler = on_auth_ticket_recieved;
-   call->id =  SteamAPI_ISteamUser_RequestEncryptedAppTicket( hSteamUser, 
-                                                              NULL, 0 );
+   call->id = 
+      SteamAPI_ISteamUser_RequestEncryptedAppTicket( hSteamUser, 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);
@@ -108,7 +115,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;
@@ -119,7 +126,7 @@ 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) + 
@@ -128,18 +135,19 @@ static void send_score_update(void)
    setscore->inetmsg_id = k_inetmsg_set_score;
 
    int count = 0;
-   for( u32 i=0; i<vg_list_size(track_infos); i++ )
-   {
-      if( track_infos[i].push )
-      {
+   for( u32 i=0; i<vg_list_size(track_infos); i++ ){
+      if( track_infos[i].push ){
          track_infos[i].push = 0;
+
+#if 0
          highscore_record *user_record = highscore_find_user_record( 0, i );
 
-         if( !user_record )
-         {
+         if( !user_record ){
             vg_error( "No score set but tried to upload for track %u\n", i );
             continue;
          }
+#endif
+         highscore_record *user_record = &track_infos[i].record;
 
          setscore->records[count].trackid = i;
          setscore->records[count].playerid = 0;
@@ -150,9 +158,7 @@ static void send_score_update(void)
       }
    }
 
-   if( count == 0 )
-      return;
-
+   if( count == 0 ) return;
    u32 send_size = sizeof(netmsg_set_score) +
                   count*sizeof(struct netmsg_score_record);
    setscore->record_count = count;
@@ -162,13 +168,14 @@ static void send_score_update(void)
          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, "Harry" );
+   memset( nick.nickname, 0, 16 );
+   vg_strncpy( steam_username_at_startup, nick.nickname, 16,
+               k_strncpy_allow_cutoff );
    
    SteamAPI_ISteamNetworkingSockets_SendMessageToConnection(
          hSteamNetworkingSockets, cremote, &nick, sizeof(netmsg_set_nickname),
@@ -177,7 +184,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();
 
@@ -188,7 +195,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 );
@@ -212,7 +219,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;
@@ -232,7 +239,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;
 
@@ -240,13 +247,11 @@ static void on_inet_scoreboard( SteamNetworkingMessage_t *msg )
       sizeof(struct netmsg_board)*vg_list_size(track_infos),
        expected = base_size+sizeof(struct netmsg_board)*sb->board_count;
 
-   if( msg->m_cbSize != expected )
-   {
+   if( msg->m_cbSize != expected ){
       vg_error( "Server scoreboard was corrupted. Size: %u != %u\n",
             msg->m_cbSize, expected );
    }
-   else
-   {
+   else{
       if( vg_list_size(track_infos) > sb->board_count )
          vg_warn( "Server is out of date, not enough boards recieved\n");
       else if( vg_list_size(track_infos) < sb->board_count )
@@ -254,8 +259,7 @@ static void on_inet_scoreboard( SteamNetworkingMessage_t *msg )
       else
          vg_success( "Recieved new scoreboards from server\n" );
 
-      for( int i=0; i < vg_min(sb->board_count,vg_list_size(track_infos)); i++)
-      {
+      for( int i=0; i < vg_min(sb->board_count,vg_list_size(track_infos)); i++){
          scoreboard_client_data.boards[i] = sb->boards[i];
          highscores_board_printf( stdout, sb->boards[i].data, 10 );
       }
@@ -268,25 +272,22 @@ static void on_inet_scoreboard( SteamNetworkingMessage_t *msg )
    network_scores_updated = 1;
 }
 
-static void poll_connection(void)
+VG_STATIC void poll_connection(void)
 {
    SteamNetworkingMessage_t *messages[32];
    int len;
 
-   while(1)
-   {
+   while(1){
       len = SteamAPI_ISteamNetworkingSockets_ReceiveMessagesOnConnection(
             hSteamNetworkingSockets, cremote, messages, vg_list_size(messages));
 
       if( len <= 0 )
          return;
 
-      for( int i=0; i<len; i++ )
-      {
+      for( int i=0; i<len; i++ ){
          SteamNetworkingMessage_t *msg = messages[i];
 
-         if( msg->m_cbSize < sizeof(netmsg_blank) )
-         {
+         if( msg->m_cbSize < sizeof(netmsg_blank) ){
             vg_warn( "Discarding message (too small: %d)\n", msg->m_cbSize );
             continue;
          }
@@ -304,28 +305,24 @@ 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 )
-   {
+   if( steam_ready ){
       static double last_update = 0.0;
       poll_connection();
       
-      if( vg_time > (last_update + 60.0) )
-      {
-         last_update = vg_time;
+      if( vg.time > (last_update + 60.0) ){
+         last_update = vg.time;
 
-         if( steam_app_ticket_length )
-         {
+         if( steam_app_ticket_length ){
             network_connect_gc();
          }
-         else
-         {
-            vg_log( "Not making remote connection; app ticket not gotten\n" );
+         else{
+            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" );
@@ -335,17 +332,16 @@ static void network_update(void)
    }
 }
 
-static void network_init(void)
+VG_STATIC void network_init(void)
 {
-   if( steam_ready )
-   {
+   if( steam_ready ){
       steam_register_callback( k_iSteamNetConnectionStatusChangedCallBack,
                                on_server_connect_status );
       request_auth_ticket();
    }
 }
 
-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 ||
@@ -358,9 +354,9 @@ static void network_end(void)
 
 #else /* SR_NETWORKED */
 
-static void network_init(void){}
-static void network_update(void){}
-static void network_end(void){}
+VG_STATIC void network_init(void){}
+VG_STATIC void network_update(void){}
+VG_STATIC void network_end(void){}
 
 #endif /* SR_NETWORKED */
 #endif /* NETWORK_H */