aboutsummaryrefslogtreecommitdiffstats
path: root/code
diff options
context:
space:
mode:
authorthilo <thilo@edf5b092-35ff-0310-97b2-ce42778d08ea>2007-01-07 16:03:19 +0000
committerthilo <thilo@edf5b092-35ff-0310-97b2-ce42778d08ea>2007-01-07 16:03:19 +0000
commit8727790c295f4243c4c94e3abb2dc1e9196587ae (patch)
tree87fdcd708e5d875c3d0eb8b7f6363ecaf4da029c /code
parentea64cc1dc7033a1ede57f6bc278030429addeef9 (diff)
downloadioquake3-aero-8727790c295f4243c4c94e3abb2dc1e9196587ae.tar.gz
ioquake3-aero-8727790c295f4243c4c94e3abb2dc1e9196587ae.zip
- Fix two non-C-standard variable declarations.
- Fix function name of vsnprintf for windows systems. git-svn-id: svn://svn.icculus.org/quake3/trunk@1027 edf5b092-35ff-0310-97b2-ce42778d08ea
Diffstat (limited to 'code')
-rw-r--r--code/client/snd_openal.c8
-rw-r--r--code/qcommon/net_chan.c2
2 files changed, 7 insertions, 3 deletions
diff --git a/code/client/snd_openal.c b/code/client/snd_openal.c
index 1bbf5e5..26628df 100644
--- a/code/client/snd_openal.c
+++ b/code/client/snd_openal.c
@@ -913,11 +913,14 @@ Play a local (non-spatialized) sound effect
static
void S_AL_StartLocalSound(sfxHandle_t sfx, int channel)
{
+ srcHandle_t src;
+
if(S_AL_CheckInput(0, sfx))
return;
// Try to grab a source
- srcHandle_t src = S_AL_SrcAlloc(SRCPRI_LOCAL, -1, channel);
+ src = S_AL_SrcAlloc(SRCPRI_LOCAL, -1, channel);
+
if(src == -1)
return;
@@ -939,12 +942,13 @@ static
void S_AL_StartSound( vec3_t origin, int entnum, int entchannel, sfxHandle_t sfx )
{
vec3_t sorigin;
+ srcHandle_t src;
if(S_AL_CheckInput(origin ? 0 : entnum, sfx))
return;
// Try to grab a source
- srcHandle_t src = S_AL_SrcAlloc(SRCPRI_ONESHOT, entnum, entchannel);
+ src = S_AL_SrcAlloc(SRCPRI_ONESHOT, entnum, entchannel);
if(src == -1)
return;
diff --git a/code/qcommon/net_chan.c b/code/qcommon/net_chan.c
index 26f76db..bd819f8 100644
--- a/code/qcommon/net_chan.c
+++ b/code/qcommon/net_chan.c
@@ -719,7 +719,7 @@ void QDECL NET_OutOfBandPrint( netsrc_t sock, netadr_t adr, const char *format,
string[3] = -1;
va_start( argptr, format );
- vsnprintf( string+4, sizeof(string)-4, format, argptr );
+ Q_vsnprintf( string+4, sizeof(string)-4, format, argptr );
va_end( argptr );
// send the datagram