summaryrefslogtreecommitdiff
path: root/src/client/snd_dma.c
diff options
context:
space:
mode:
authorTim Angus <tim@ngus.net>2009-10-03 11:39:42 +0000
committerTim Angus <tim@ngus.net>2013-01-03 00:15:12 +0000
commitcc75aa64bbd2c7b3d63c4857fbb848bab364a26c (patch)
treeee3887ba908f8a79cdf35a89f6b01c8a8fb7ad46 /src/client/snd_dma.c
parent7148805cd7831e3c33dd0965d9034ed5844e6464 (diff)
* Merge ioq3-r1272
Diffstat (limited to 'src/client/snd_dma.c')
-rw-r--r--src/client/snd_dma.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/client/snd_dma.c b/src/client/snd_dma.c
index ec92da69..93d9a316 100644
--- a/src/client/snd_dma.c
+++ b/src/client/snd_dma.c
@@ -494,8 +494,8 @@ void S_Base_StartSound(vec3_t origin, int entityNum, int entchannel, sfxHandle_t
ch = s_channels;
inplay = 0;
for ( i = 0; i < MAX_CHANNELS ; i++, ch++ ) {
- if (ch[i].entnum == entityNum && ch[i].thesfx == sfx) {
- if (time - ch[i].allocTime < 50) {
+ if (ch->entnum == entityNum && ch->thesfx == sfx) {
+ if (time - ch->allocTime < 50) {
// if (Cvar_VariableValue( "cg_showmiss" )) {
// Com_Printf("double sound start\n");
// }
@@ -532,6 +532,7 @@ void S_Base_StartSound(vec3_t origin, int entityNum, int entchannel, sfxHandle_t
}
}
if (chosen == -1) {
+ ch = s_channels;
if (ch->entnum == listener_number) {
for ( i = 0 ; i < MAX_CHANNELS ; i++, ch++ ) {
if (ch->allocTime<oldest) {