kai/assaultcube-
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*** empty log message ***

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@1344 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
Lee Salzman
2007-10-10 06:20:22 +00:00
parent 35a96d83d3
commit 11f6d5e5dd
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/sound.cpp
+6 -11
View File
@@ -252,10 +252,10 @@ VAR(stereo, 0, 1, 1);
void updatechanvol(int chan, int svol, const vec *loc = NULL, entity *ent = NULL)
{
int vol = soundvol, pan = 255/2;
if(loc)
if(loc || ent)
{
vec v;
float dist = camera1->o.dist(*loc, v);
float dist = camera1->o.dist(ent ? vec(ent->x, ent->y, ent->z) : *loc, v);
if(ent)
{
int rad = ent->attr2;
@@ -291,7 +291,7 @@ void updatechanvol(int chan, int svol, const vec *loc = NULL, entity *ent = NULL
void newsoundloc(int chan, const vec *loc, soundslot *slot, entity *ent = NULL)
{
while(chan >= soundlocs.length()) soundlocs.add().inuse = false;
soundlocs[chan].loc = *loc;
soundlocs[chan].loc = ent ? vec(ent->x, ent->y, ent->z) : *loc;
soundlocs[chan].inuse = true;
soundlocs[chan].slot = slot;
soundlocs[chan].ent = ent;
@@ -370,18 +370,12 @@ void playsound(int n, const vec *loc, entity *ent)
#endif
if(chan<0) return;
vec eloc; //fixme,ah
if(ent)
{
eloc.x = ent->x;
eloc.y = ent->y;
eloc.z = ent->z;
loc = &eloc;
//loc = &ent->o;
ent->visible = true;
slot.uses++;
}
if(loc) newsoundloc(chan, loc, &slot, ent);
if(loc || ent) newsoundloc(chan, loc, &slot, ent);
updatechanvol(chan, slot.vol, loc, ent);
#ifndef USE_MIXER
FSOUND_SetPaused(chan, false);
@@ -403,4 +397,5 @@ void playsoundc(int n)
{
addmsg(SV_SOUND, "i", n);
playsound(n);
}
}