From: vortex Date: Thu, 15 Apr 2010 11:13:22 +0000 (+0000) Subject: S_GetEntChallelPosition -> S_GetEntChannelPosition X-Git-Tag: xonotic-v0.1.0preview~230^2~386 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6565597d1fb3cdf77b34f2497e6a0d54c544a9c5;p=xonotic%2Fdarkplaces.git S_GetEntChallelPosition -> S_GetEntChannelPosition git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10089 d7cf8633-e32d-0410-b094-e92efae38249 --- diff --git a/prvm_cmds.c b/prvm_cmds.c index c0770232..490a0c81 100644 --- a/prvm_cmds.c +++ b/prvm_cmds.c @@ -2902,7 +2902,7 @@ void VM_getsoundtime (void) entchannel = (int)PRVM_G_FLOAT(OFS_PARM1); if (entchannel <= 0 || entchannel > 8) VM_Warning("VM_getsoundtime: %s: bad channel %i\n", PRVM_NAME, entchannel); - PRVM_G_FLOAT(OFS_RETURN) = (float)S_GetEntChallelPosition(entnum, entchannel); + PRVM_G_FLOAT(OFS_RETURN) = (float)S_GetEntChannelPosition(entnum, entchannel); } /* diff --git a/snd_main.c b/snd_main.c index 309dd34c..87c223a4 100644 --- a/snd_main.c +++ b/snd_main.c @@ -1692,7 +1692,7 @@ float S_GetChannelPosition (unsigned int ch_ind) return (s % sfx->total_length) / (float) S_GetSoundRate(); } -float S_GetEntChallelPosition(int entnum, int entchannel) +float S_GetEntChannelPosition(int entnum, int entchannel) { channel_t *ch; unsigned int i; diff --git a/snd_null.c b/snd_null.c index 0b97ef62..7362dc56 100755 --- a/snd_null.c +++ b/snd_null.c @@ -157,7 +157,7 @@ float S_GetChannelPosition (unsigned int ch_ind) return -1; } -float S_GetEntChallelPosition(int entnum, int entchannel) +float S_GetEntChannelPosition(int entnum, int entchannel) { return -1; } diff --git a/sound.h b/sound.h index c8277653..fa435c88 100644 --- a/sound.h +++ b/sound.h @@ -86,7 +86,7 @@ void S_StopChannel (unsigned int channel_ind, qboolean lockmutex); qboolean S_SetChannelFlag (unsigned int ch_ind, unsigned int flag, qboolean value); void S_SetChannelVolume (unsigned int ch_ind, float fvol); float S_GetChannelPosition (unsigned int ch_ind); -float S_GetEntChallelPosition(int entnum, int entchannel); +float S_GetEntChannelPosition(int entnum, int entchannel); void S_BlockSound (void); void S_UnblockSound (void);