minor changes

[carveJwlIkooP6JGAAIwe30JlM.git] / network.c

diff --git a/network.c b/network.c
index 5d00d16c3b0fb43862b54fd2841491f4c6625ac2..da0be1e392e07fc65f7df722041a4c913e2af1a9 100644 (file)
--- a/network.c
+++ b/network.c
@@ -57,83 +57,6 @@ static void request_auth_ticket(void){
       SteamAPI_ISteamUser_RequestEncryptedAppTicket( hSteamUser, NULL, 0 );
 }
 
-#if 0
-static void send_score_request(void){
-   vg_info( "Requesting scores\n" );
-   netmsg_scores_request req;
-   req.inetmsg_id = k_inetmsg_scores_request;
-
-   SteamAPI_ISteamNetworkingSockets_SendMessageToConnection(
-         hSteamNetworkingSockets, network_client.remote, 
-         &req, sizeof(netmsg_scores_request),
-         k_nSteamNetworkingSend_Reliable, NULL );
-}
-
-static void send_score_update(void){
-   vg_info( "Sending scores\n" );
-   u32 size = sizeof(netmsg_set_score) + 
-                  vg_list_size(track_infos)*sizeof(struct netmsg_score_record);
-   netmsg_set_score *setscore = alloca( size );
-   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 ){
-         track_infos[i].push = 0;
-
-#if 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;
-         }
-#endif
-         highscore_record *user_record = &track_infos[i].record;
-
-         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, network_client.remote, setscore, send_size,
-         k_nSteamNetworkingSend_Reliable, NULL );
-}
-
-static void send_nickname(void){
-   netmsg_set_nickname nick;
-   nick.inetmsg_id = k_inetmsg_set_nickname;
-
-   memset( nick.nickname, 0, 16 );
-   vg_strncpy( steam_username_at_startup, nick.nickname, 16,
-               k_strncpy_allow_cutoff );
-   
-   SteamAPI_ISteamNetworkingSockets_SendMessageToConnection(
-         hSteamNetworkingSockets, network_client.remote, 
-         &nick, sizeof(netmsg_set_nickname),
-         k_nSteamNetworkingSend_Reliable, NULL );
-
-   network_client.name_update = 0;
-}
-#endif
-
-#if 0
-static void server_routine_update(void){
-   send_score_update();
-   send_score_request();
-}
-#endif
-
 static void network_send_username(void){
    netmsg_playerusername *update = alloca( sizeof(netmsg_playerusername)+
                                            NETWORK_USERNAME_MAX );
@@ -422,15 +345,8 @@ static void on_persona_state_change( CallbackMsg_t *msg ){
 static void network_connect(void){
    /* Connect to server if not connected */
    SteamNetworkingIPAddr remoteAddr;
-
-#ifdef SR_USE_LOCALHOST
-   SteamAPI_SteamNetworkingIPAddr_SetIPv6LocalHost( &remoteAddr, 27402 );
-#else
-   const char *server_lon1 = "46.101.34.155:27402";
-   SteamAPI_SteamNetworkingIPAddr_ParseString( &remoteAddr, server_lon1 );
-#endif
-   const char *server_lan = "192.168.1.32:27402";
-   SteamAPI_SteamNetworkingIPAddr_ParseString( &remoteAddr, server_lan );
+   SteamAPI_SteamNetworkingIPAddr_ParseString( &remoteAddr, 
+                                               network_client.server_adress );
 
    char buf[256];
    SteamAPI_SteamNetworkingIPAddr_ToString( &remoteAddr, buf, 256, 1 );
@@ -440,42 +356,6 @@ static void network_connect(void){
                   hSteamNetworkingSockets, &remoteAddr, 0, NULL );
 }
 
-#if 0
-static void on_inet_scoreboard( SteamNetworkingMessage_t *msg ){
-   netmsg_scoreboard *sb = msg->m_pData;
-
-   u32 base_size = sizeof(netmsg_scoreboard)-
-      sizeof(struct netmsg_board)*vg_list_size(track_infos),
-       expected = base_size+sizeof(struct netmsg_board)*sb->board_count;
-
-   if( msg->m_cbSize != expected ){
-      vg_error( "Server scoreboard was corrupted. Size: %u != %u\n",
-            msg->m_cbSize, expected );
-   }
-   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 )
-         vg_warn( "Client out of date, server sent more boards than we have\n");
-      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++){
-         scoreboard_client_data.boards[i] = sb->boards[i];
-         highscores_board_printf( stdout, sb->boards[i].data, 10 );
-      }
-   }
-
-#if 0
-   /* We dont need to stay on the server currently */
-   SteamAPI_ISteamNetworkingSockets_CloseConnection(
-         hSteamNetworkingSockets, network_client.remote, 0, NULL, 1 );
-#endif
-
-   network_scores_updated = 1;
-}
-#endif
-
 static void poll_remote_connection(void){
    SteamNetworkingMessage_t *messages[32];
    int len;