summaryrefslogtreecommitdiff
path: root/src/server/server.h
diff options
context:
space:
mode:
authorTim Angus <tim@ngus.net>2011-04-23 22:38:25 +0000
committerTim Angus <tim@ngus.net>2013-01-03 00:18:07 +0000
commit06006eb6930de74c577c87daf6a0f7917e22d578 (patch)
tree8caec25df040a3f3eddc99b593e51d993b9be1be /src/server/server.h
parent98438cc3e7d32312bb52b413c12698b67b8cfeb0 (diff)
* Merge ioq3-r1946
Diffstat (limited to 'src/server/server.h')
-rw-r--r--src/server/server.h10
1 files changed, 2 insertions, 8 deletions
diff --git a/src/server/server.h b/src/server/server.h
index ad9fcde4..0475f0b9 100644
--- a/src/server/server.h
+++ b/src/server/server.h
@@ -220,10 +220,6 @@ typedef struct {
qboolean connected;
} challenge_t;
-
-#define MAX_MASTERS 8 // max recipients for heartbeat packets
-
-
// this structure will be cleared only when the game dll changes
typedef struct {
qboolean initialized; // sv_init has completed
@@ -249,8 +245,6 @@ extern serverStatic_t svs; // persistant server info across maps
extern server_t sv; // cleared each map
extern vm_t *gvm; // game virtual machine
-#define MAX_MASTER_SERVERS 5
-
extern cvar_t *sv_fps;
extern cvar_t *sv_timeout;
extern cvar_t *sv_zombietime;
@@ -276,6 +270,8 @@ extern cvar_t *sv_maxPing;
extern cvar_t *sv_pure;
extern cvar_t *sv_lanForceRate;
extern cvar_t *sv_dequeuePeriod;
+extern cvar_t *sv_heartbeat;
+extern cvar_t *sv_flatline;
#ifdef USE_VOIP
extern cvar_t *sv_voip;
@@ -295,13 +291,11 @@ void SV_AddOperatorCommands (void);
void SV_RemoveOperatorCommands (void);
-void SV_MasterHeartbeat (void);
void SV_MasterShutdown (void);
void SV_MasterGameStat( const char *data );
-
//
// sv_init.c
//