MENY

[carveJwlIkooP6JGAAIwe30JlM.git] / network.h

diff --git a/network.h b/network.h
index 42bee347766226016a3b85b522a437062ecf21e1..e06027aa88b97cc7d56154dc3e3a4c0d74a133f3 100644 (file)
--- 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,10 +14,10 @@
 /* 
  * Interface
  */
-#define SR_USE_LOCALHOST
+//#define SR_USE_LOCALHOST
 
 /* Call it at start; Connects us to the gameserver */
-static int network_init(void);
+static void network_init(void);
 
 /* Run this from main loop */
 static void network_update(void);
@@ -166,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, "Harry" );
+   memset( nick.nickname, 0, 16 );
+   vg_strncpy( steam_username_at_startup, nick.nickname, 16 );
    
    SteamAPI_ISteamNetworkingSockets_SendMessageToConnection(
          hSteamNetworkingSockets, cremote, &nick, sizeof(netmsg_set_nickname),
@@ -310,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 )
          {
@@ -324,7 +329,7 @@ static void network_update(void)
          }
       }
 
-      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" );
@@ -334,7 +339,7 @@ static void network_update(void)
    }
 }
 
-static int network_init(void)
+static void network_init(void)
 {
    if( steam_ready )
    {
@@ -342,8 +347,6 @@ static int network_init(void)
                                on_server_connect_status );
       request_auth_ticket();
    }
-
-   return 1;
 }
 
 static void network_end(void*_)
@@ -359,7 +362,7 @@ static void network_end(void*_)
 
 #else /* SR_NETWORKED */
 
-static int network_init(void){ return 1; }
+static void network_init(void){}
 static void network_update(void){}
 static void network_end(void*_){}