ioquake/ioq3
0
0
Fork 0
mirror of https://github.com/ioquake/ioq3.git synced 2024-11-10 07:11:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Let's not ifdef MISSIONPACK inside of ifdef MISSIONPACK

Browse source
This commit is contained in:
Zack Middleton 2015-03-31 04:53:27 -05:00
parent 10c5f0b5a9
commit 8265af84be
1 changed files with 1 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
code/cgame/cg_servercmds.c
View file

@ -820,7 +820,6 @@ CG_PlayVoiceChat
================= =================
*/ */
void CG_PlayVoiceChat( bufferedVoiceChat_t *vchat ) { void CG_PlayVoiceChat( bufferedVoiceChat_t *vchat ) {
#ifdef MISSIONPACK
// if we are going into the intermission, don't start any voices // if we are going into the intermission, don't start any voices
if ( cg.intermissionStarted ) { if ( cg.intermissionStarted ) {
return; return;
@ -845,7 +844,6 @@ void CG_PlayVoiceChat( bufferedVoiceChat_t *vchat ) {
CG_Printf( "%s\n", vchat->message ); CG_Printf( "%s\n", vchat->message );
} }
voiceChatBuffer[cg.voiceChatBufferOut].snd = 0; voiceChatBuffer[cg.voiceChatBufferOut].snd = 0;
#endif
} }
/* /*
@ -854,7 +852,6 @@ CG_PlayBufferedVoieChats
===================== =====================
*/ */
void CG_PlayBufferedVoiceChats( void ) { void CG_PlayBufferedVoiceChats( void ) {
#ifdef MISSIONPACK
if ( cg.voiceChatTime < cg.time ) { if ( cg.voiceChatTime < cg.time ) {
if (cg.voiceChatBufferOut != cg.voiceChatBufferIn && voiceChatBuffer[cg.voiceChatBufferOut].snd) { if (cg.voiceChatBufferOut != cg.voiceChatBufferIn && voiceChatBuffer[cg.voiceChatBufferOut].snd) {
// //
@ -864,7 +861,6 @@ void CG_PlayBufferedVoiceChats( void ) {
cg.voiceChatTime = cg.time + 1000; cg.voiceChatTime = cg.time + 1000;
} }
} }
#endif
} }
/* /*
@ -873,7 +869,6 @@ CG_AddBufferedVoiceChat
===================== =====================
*/ */
void CG_AddBufferedVoiceChat( bufferedVoiceChat_t *vchat ) { void CG_AddBufferedVoiceChat( bufferedVoiceChat_t *vchat ) {
#ifdef MISSIONPACK
// if we are going into the intermission, don't start any voices // if we are going into the intermission, don't start any voices
if ( cg.intermissionStarted ) { if ( cg.intermissionStarted ) {
return; return;
@ -885,7 +880,6 @@ void CG_AddBufferedVoiceChat( bufferedVoiceChat_t *vchat ) {
CG_PlayVoiceChat( &voiceChatBuffer[cg.voiceChatBufferOut] ); CG_PlayVoiceChat( &voiceChatBuffer[cg.voiceChatBufferOut] );
cg.voiceChatBufferOut++; cg.voiceChatBufferOut++;
} }
#endif
} }
/* /*
@ -894,7 +888,6 @@ CG_VoiceChatLocal
================= =================
*/ */
void CG_VoiceChatLocal( int mode, qboolean voiceOnly, int clientNum, int color, const char *cmd ) { void CG_VoiceChatLocal( int mode, qboolean voiceOnly, int clientNum, int color, const char *cmd ) {
#ifdef MISSIONPACK
char *chat; char *chat;
voiceChatList_t *voiceChatList; voiceChatList_t *voiceChatList;
clientInfo_t *ci; clientInfo_t *ci;
@ -934,7 +927,6 @@ void CG_VoiceChatLocal( int mode, qboolean voiceOnly, int clientNum, int color,
CG_AddBufferedVoiceChat(&vchat); CG_AddBufferedVoiceChat(&vchat);
} }
} }
#endif
} }
/* /*
@ -962,7 +954,7 @@ void CG_VoiceChat( int mode ) {
CG_VoiceChatLocal( mode, voiceOnly, clientNum, color, cmd ); CG_VoiceChatLocal( mode, voiceOnly, clientNum, color, cmd );
} }
#endif #endif // MISSIONPACK
/* /*
================= =================