projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
basic dead device and some comments for next time
[carveJwlIkooP6JGAAIwe30JlM.git]
/
network.h
diff --git
a/network.h
b/network.h
index e06027aa88b97cc7d56154dc3e3a4c0d74a133f3..4d34e82bb75a881c47d071879440cda821a209da 100644
(file)
--- a/
network.h
+++ b/
network.h
@@
-17,19
+17,19
@@
//#define SR_USE_LOCALHOST
/* Call it at start; Connects us to the gameserver */
//#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 */
/* Run this from main loop */
-
static
void network_update(void);
+
VG_STATIC
void network_update(void);
/* Call it at shutdown */
/* 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
*/
/*
* 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
/*
* Game endpoints are provided with the same names to allow running without a
@@
-40,21
+40,21
@@
static void network_submit_highscore( u32 trackid, u16 points, u16 time );
/*
* Runtime connection stuff
*/
/*
* 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
*/
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;
{
EncryptedAppTicketResponse_t *response = result;
@@
-82,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.
{
/*
* TODO Check for one thats cached on the disk and load it.
@@
-97,7
+97,7
@@
static void request_auth_ticket(void)
NULL, 0 );
}
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);
{
u32 size = sizeof(netmsg_auth) + steam_app_ticket_length;
netmsg_auth *auth = alloca(size);
@@
-112,7
+112,7
@@
static void send_auth_ticket(void)
k_nSteamNetworkingSend_Reliable, NULL );
}
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;
{
vg_info( "Requesting scores\n" );
netmsg_scores_request req;
@@
-123,7
+123,7
@@
static void send_score_request(void)
k_nSteamNetworkingSend_Reliable, NULL );
}
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) +
{
vg_info( "Sending scores\n" );
u32 size = sizeof(netmsg_set_score) +
@@
-166,7
+166,7
@@
static void send_score_update(void)
k_nSteamNetworkingSend_Reliable, NULL );
}
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;
{
netmsg_set_nickname nick;
nick.inetmsg_id = k_inetmsg_set_nickname;
@@
-181,7
+181,7
@@
static void send_nickname(void)
network_name_update = 0;
}
network_name_update = 0;
}
-
static
void server_routine_update(void)
+
VG_STATIC
void server_routine_update(void)
{
send_auth_ticket();
{
send_auth_ticket();
@@
-192,7
+192,7
@@
static void server_routine_update(void)
send_score_request();
}
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 );
{
SteamNetConnectionStatusChangedCallback_t *info = (void *)msg->m_pubParam;
vg_info( " Connection status changed for %lu\n", info->m_hConn );
@@
-216,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;
{
/* Connect to server if not connected */
SteamNetworkingIPAddr remoteAddr;
@@
-236,7
+236,7
@@
static void network_connect_gc(void)
hSteamNetworkingSockets, &remoteAddr, 0, NULL );
}
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;
{
netmsg_scoreboard *sb = msg->m_pData;
@@
-272,7
+272,7
@@
static void on_inet_scoreboard( SteamNetworkingMessage_t *msg )
network_scores_updated = 1;
}
network_scores_updated = 1;
}
-
static
void poll_connection(void)
+
VG_STATIC
void poll_connection(void)
{
SteamNetworkingMessage_t *messages[32];
int len;
{
SteamNetworkingMessage_t *messages[32];
int len;
@@
-308,7
+308,7
@@
static void poll_connection(void)
/*
* Subroutine to be connected to main game loop, runs all routines on timers
*/
/*
* 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 )
{
@@
-339,7
+339,7
@@
static void network_update(void)
}
}
}
}
-
static
void network_init(void)
+
VG_STATIC
void network_init(void)
{
if( steam_ready )
{
{
if( steam_ready )
{
@@
-349,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 ||
{
/* TODO: Fire off any buffered highscores that need to be setn */
if( cremote_state == k_ESteamNetworkingConnectionState_Connected ||
@@
-362,9
+362,9
@@
static void network_end(void*_)
#else /* SR_NETWORKED */
#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 */
#endif /* SR_NETWORKED */
#endif /* NETWORK_H */