aboutsummaryrefslogtreecommitdiffstats
path: root/code/client/client.h
diff options
context:
space:
mode:
authortma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea>2008-07-07 22:31:39 +0000
committertma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea>2008-07-07 22:31:39 +0000
commit80e25417be92abff3053a4d8f209349a16e6d334 (patch)
tree1058d52d8de3d7115cf5b018e00408b0db8c5341 /code/client/client.h
parentafbf4dd0c3999e58f59b3d4e3dd4b93d6abe8fd0 (diff)
downloadioquake3-aero-80e25417be92abff3053a4d8f209349a16e6d334.tar.gz
ioquake3-aero-80e25417be92abff3053a4d8f209349a16e6d334.zip
* Rename voip cvar to cl_voip
* s/#if USE_VOIP/#ifdef USE_VOIP/ * Add generalised runtime cvar range checking, currently on [sv|cl]_voip, dedicated and a bunch of r_ variables git-svn-id: svn://svn.icculus.org/quake3/trunk@1420 edf5b092-35ff-0310-97b2-ce42778d08ea
Diffstat (limited to 'code/client/client.h')
-rw-r--r--code/client/client.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/code/client/client.h b/code/client/client.h
index 42d4b0a..b380999 100644
--- a/code/client/client.h
+++ b/code/client/client.h
@@ -34,7 +34,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include "cl_curl.h"
#endif /* USE_CURL */
-#if USE_VOIP
+#ifdef USE_VOIP
#include "speex/speex.h"
#include "speex/speex_preprocess.h"
#endif
@@ -230,7 +230,7 @@ typedef struct {
int timeDemoMaxDuration; // maximum frame duration
unsigned char timeDemoDurations[ MAX_TIMEDEMO_DURATIONS ]; // log of frame durations
-#if USE_VOIP
+#ifdef USE_VOIP
qboolean speexInitialized;
int speexFrameSize;
int speexSampleRate;
@@ -407,7 +407,7 @@ extern cvar_t *cl_useMumble;
extern cvar_t *cl_mumbleScale;
#endif
-#if USE_VOIP
+#ifdef USE_VOIP
// cl_voipSendTarget is a string: "all" to broadcast to everyone, "none" to
// send to no one, or a comma-separated list of client numbers:
// "0,7,2,23" ... an empty string is treated like "all".
@@ -418,7 +418,7 @@ extern cvar_t *cl_voipSendTarget;
extern cvar_t *cl_voipGainDuringCapture;
extern cvar_t *cl_voipCaptureMult;
extern cvar_t *cl_voipShowMeter;
-extern cvar_t *voip;
+extern cvar_t *cl_voip;
#endif
//=================================================
@@ -475,7 +475,7 @@ extern kbutton_t in_mlook, in_klook;
extern kbutton_t in_strafe;
extern kbutton_t in_speed;
-#if USE_VOIP
+#ifdef USE_VOIP
extern kbutton_t in_voiprecord;
#endif
@@ -500,7 +500,7 @@ void Key_SetCatcher( int catcher );
extern int cl_connectedToPureServer;
extern int cl_connectedToCheatServer;
-#if USE_VOIP
+#ifdef USE_VOIP
extern int cl_connectedToVoipServer;
void CL_Voip_f( void );
#endif