revision 2

[carveJwlIkooP6JGAAIwe30JlM.git] / network.h

diff --git a/network.h b/network.h
index 08a989b3b1edf2f1c627e80b54461f191a1de472..7500c8800552619d94af1d6ac33e20473aad4e3f 100644 (file)
--- a/network.h
+++ b/network.h
@@ -3,10 +3,9 @@
  * All trademarks are property of their respective owners
  */
 
-#ifndef NETWORK_H
-#define NETWORK_H
-
+#pragma once
 #include "vg/vg_platform.h"
+#include "vg/vg_steam_networking.h"
 #include "steam.h"
 #include "network_common.h"
 #include "network_msg.h"
@@ -19,26 +18,27 @@
  */
 
 /* Call it at start; Connects us to the gameserver */
-static void network_init(void);
+void network_init(void);
 
 /* Run this from main loop */
-static void network_update(void);
+void network_update(void);
 
 /* Call it at shutdown */
-static void network_end(void);
+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 );
+void network_submit_highscore( u32 trackid, u16 points, u16 time );
 
 /*
  * Game endpoints are provided with the same names to allow running without a
  * network connection.
  */
 
-struct {
+struct network_client
+{
    u8 app_symmetric_key[ 1024 ];
    u32 app_key_length;
    EServerMode auth_mode;
@@ -71,28 +71,22 @@ struct {
    f64 last_intent_change;
    f32 fintent; /* yeah this shit really shouldnt be here but oh well */
 }
-static network_client = {
-   .auth_mode = eServerModeAuthentication,
-   .state = k_ESteamNetworkingConnectionState_None,
-   .server_adress = "46.101.34.155",
-   .last_intent_change = -99999.9
-};
-
-static int packet_minsize( SteamNetworkingMessage_t *msg, u32 size );
-static void network_send_item( enum netmsg_playeritem_type type );
-static void network_request_scoreboard( const char *mod_uid, 
-                                        const char *route_uid,
-                                        u32 week, u64 userdata );
-static void network_publish_laptime( const char *mod_uid, 
-                                     const char *route_uid, f64 lap_time );
-static void chat_send_message( const char *message );
-static void render_server_status_gui(void);
-static void network_status_string( vg_str *str, u32 *colour );
-static void network_send_region(void);
-
-static int network_connected(void){
+extern network_client;
+
+int packet_minsize( SteamNetworkingMessage_t *msg, u32 size );
+void network_send_item( enum netmsg_playeritem_type type );
+void network_request_scoreboard( const char *mod_uid, 
+                                 const char *route_uid,
+                                 u32 week, u64 userdata );
+void network_publish_laptime( const char *mod_uid, 
+                              const char *route_uid, f64 lap_time );
+void chat_send_message( const char *message );
+void render_server_status_gui(void);
+void network_status_string( vg_str *str, u32 *colour );
+void network_send_region(void);
+
+static inline int network_connected(void)
+{
    if( network_client.remote_version != NETWORK_SKATERIFT_VERSION ) return 0;
    return network_client.state == k_ESteamNetworkingConnectionState_Connected;
 }
-
-#endif /* NETWORK_H */