projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
imgui stuff
[carveJwlIkooP6JGAAIwe30JlM.git]
/
network.h
diff --git
a/network.h
b/network.h
index 42bee347766226016a3b85b522a437062ecf21e1..ffd2dbe3cf4d0d98eb454a9281032e4467ae77b0 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
#ifndef NETWORK_H
#define NETWORK_H
@@
-6,25
+11,27
@@
#include "network_msg.h"
#include "highscores.h"
#include "network_msg.h"
#include "highscores.h"
+VG_STATIC int network_scores_updated = 0;
+
/*
* Interface
*/
/*
* Interface
*/
-#define SR_USE_LOCALHOST
+
//
#define SR_USE_LOCALHOST
/* Call it at start; Connects us to the gameserver */
/* Call it at start; Connects us to the gameserver */
-
static int
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
@@
-35,21
+42,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;
@@
-77,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.
{
/*
* TODO Check for one thats cached on the disk and load it.
@@
-92,7
+99,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);
@@
-107,7
+114,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;
@@
-118,7
+125,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) +
@@
-161,13
+168,14
@@
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;
- 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),
SteamAPI_ISteamNetworkingSockets_SendMessageToConnection(
hSteamNetworkingSockets, cremote, &nick, sizeof(netmsg_set_nickname),
@@
-176,7
+184,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();
@@
-187,7
+195,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 );
@@
-211,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;
{
/* Connect to server if not connected */
SteamNetworkingIPAddr remoteAddr;
@@
-231,7
+239,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;
@@
-267,7
+275,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;
@@
-303,16
+311,16
@@
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 )
{
static double last_update = 0.0;
poll_connection();
{
if( steam_ready )
{
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 )
{
if( steam_app_ticket_length )
{
@@
-324,7
+332,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" );
(cremote_state == k_ESteamNetworkingConnectionState_Connected ))
{
vg_warn( "Connected to server but no return... disconnecting\n" );
@@
-334,7
+342,7
@@
static void network_update(void)
}
}
}
}
-
static int
network_init(void)
+
VG_STATIC void
network_init(void)
{
if( steam_ready )
{
{
if( steam_ready )
{
@@
-342,11
+350,9
@@
static int network_init(void)
on_server_connect_status );
request_auth_ticket();
}
on_server_connect_status );
request_auth_ticket();
}
-
- return 1;
}
}
-
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 ||
@@
-359,9
+365,9
@@
static void network_end(void*_)
#else /* SR_NETWORKED */
#else /* SR_NETWORKED */
-
static int network_init(void){ return 1;
}
-
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 */