diff options
| author | Tim Angus <tim@ngus.net> | 2009-10-03 11:52:53 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-01-03 00:15:28 +0000 |
| commit | b47a49a03370e7ea42f47623b9f72a5ca799f0e7 (patch) | |
| tree | 9d64d778ded2971d7ebd05970d903d886bd81436 /src/server/server.h | |
| parent | 09ceb08b95978feb0a9b737f22ac0f662c7465d6 (diff) | |
* Merge ioq3-r1423
+ IPv6
+ VoIP
+ Stereo rendering
+ Other minor stuff
Diffstat (limited to 'src/server/server.h')
| -rw-r--r-- | src/server/server.h | 32 |
1 files changed, 30 insertions, 2 deletions
diff --git a/src/server/server.h b/src/server/server.h index 331937e4..bdcd8729 100644 --- a/src/server/server.h +++ b/src/server/server.h @@ -34,6 +34,18 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define MAX_ENT_CLUSTERS 16 +#ifdef USE_VOIP +typedef struct voipServerPacket_s +{ + int generation; + int sequence; + int frames; + int len; + int sender; + byte data[1024]; +} voipServerPacket_t; +#endif + typedef struct svEntity_s { struct worldSector_s *worldSector; struct svEntity_s *nextEntityInWorldSector; @@ -168,6 +180,14 @@ typedef struct client_s { netchan_buffer_t *netchan_start_queue; netchan_buffer_t **netchan_end_queue; +#ifdef USE_VOIP + qboolean hasVoip; + qboolean muteAllVoip; + qboolean ignoreVoipFromClient[MAX_CLIENTS]; + voipServerPacket_t voipPacket[64]; // !!! FIXME: WAY too much memory! + int queuedVoipPackets; +#endif + int oldServerTime; qboolean csUpdated[MAX_CONFIGSTRINGS+1]; } client_t; @@ -250,6 +270,11 @@ extern cvar_t *sv_pure; extern cvar_t *sv_lanForceRate; extern cvar_t *sv_dequeuePeriod; +#ifdef USE_VOIP +extern cvar_t *sv_voip; +#endif + + //=========================================================== // @@ -292,8 +317,6 @@ void SV_GetChallenge( netadr_t from ); void SV_DirectConnect( netadr_t from ); -void SV_AuthorizeIpPacket( netadr_t from ); - void SV_ExecuteClientMessage( client_t *cl, msg_t *msg ); void SV_UserinfoChanged( client_t *cl ); @@ -305,6 +328,11 @@ void SV_ClientThink (client_t *cl, usercmd_t *cmd); void SV_WriteDownloadToClient( client_t *cl , msg_t *msg ); +#ifdef USE_VOIP +void SV_WriteVoipToClient( client_t *cl, msg_t *msg ); +#endif + + // // sv_ccmds.c // |