diff options
author | Simon Howard | 2011-02-12 18:42:10 +0000 |
---|---|---|
committer | Simon Howard | 2011-02-12 18:42:10 +0000 |
commit | 516a7028994df6718289a7e3db4d07a45c95466b (patch) | |
tree | cf974cb4bd38b8e9d0101a41263b42b8c87e96c7 /src/net_client.h | |
parent | a15ba75736d15409876c1f0a44fffc99adf1c192 (diff) | |
parent | a9996b41e954d85fde5ec5188bbf6a7f4df88011 (diff) | |
download | chocolate-doom-516a7028994df6718289a7e3db4d07a45c95466b.tar.gz chocolate-doom-516a7028994df6718289a7e3db4d07a45c95466b.tar.bz2 chocolate-doom-516a7028994df6718289a7e3db4d07a45c95466b.zip |
Merge from raven-branch. FEATURE_MULTIPLAYER has been disabled
temporarily until the netgame changes on raven-branch are finished.
Subversion-branch: /branches/strife-branch
Subversion-revision: 2259
Diffstat (limited to 'src/net_client.h')
-rw-r--r-- | src/net_client.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/net_client.h b/src/net_client.h index 078a19a2..b071d32a 100644 --- a/src/net_client.h +++ b/src/net_client.h @@ -31,12 +31,13 @@ #define MAXPLAYERNAME 30 -boolean NET_CL_Connect(net_addr_t *addr); +boolean NET_CL_Connect(net_addr_t *addr, net_connect_data_t *data); void NET_CL_Disconnect(void); void NET_CL_Run(void); void NET_CL_Init(void); -void NET_CL_StartGame(); +void NET_CL_StartGame(net_gamesettings_t *settings); void NET_CL_SendTiccmd(ticcmd_t *ticcmd, int maketic); +boolean NET_CL_GetSettings(net_gamesettings_t *_settings); void NET_Init(void); void NET_BindVariables(void); @@ -59,6 +60,7 @@ extern md5_digest_t net_local_wad_md5sum; extern md5_digest_t net_local_deh_md5sum; extern unsigned int net_local_is_freedoom; +extern boolean drone; #endif /* #ifndef NET_CLIENT_H */ |