zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-12 03:00:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

Crosshair toggle quote fix, JFAud cache changes from JonoF and some JFAud changes from me as well

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@100 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2006-04-23 07:16:16 +00:00
parent e51efc7b73
commit 0f36d845b5
2 changed files with 35 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
polymer/eduke32/source/game.c
View file

@ -7010,8 +7010,8 @@ void nonsharedkeys(void)
if( BUTTON(gamefunc_Toggle_Crosshair) ) if( BUTTON(gamefunc_Toggle_Crosshair) )
{ {
CONTROL_ClearButton(gamefunc_Toggle_Crosshair); CONTROL_ClearButton(gamefunc_Toggle_Crosshair);
ud.crosshair = 1-ud.crosshair; ud.crosshair = (ud.crosshair==3)?0:ud.crosshair+1;
FTA(21-ud.crosshair,&ps[screenpeek]); FTA(ud.crosshair?20:21,&ps[screenpeek]);
} }
if(ud.overhead_on && BUTTON(gamefunc_Map_Follow_Mode) ) if(ud.overhead_on && BUTTON(gamefunc_Map_Follow_Mode) )

40
polymer/eduke32/source/jfaud_sounds.cpp
View file

@ -207,7 +207,7 @@ void SoundStartup(void)
k = Bgetsysmemsize()/100*30; k = Bgetsysmemsize()/100*30;
else else
k = Bgetsysmemsize()/100*50 - MAXCACHE1DSIZE; k = Bgetsysmemsize()/100*50 - MAXCACHE1DSIZE;
jfaud->SetCacheSize(k,k/2); jfaud->SetCacheItemAge(24*120); // 24 movements per second, 120 seconds max lifetime
} }
chans = new SoundChannel[NumVoices]; chans = new SoundChannel[NumVoices];
@ -253,7 +253,7 @@ void AudioUpdate(void)
if (chans[i].chan && !jfaud->IsValidSound(chans[i].chan)) if (chans[i].chan && !jfaud->IsValidSound(chans[i].chan))
chans[i].chan = NULL; chans[i].chan = NULL;
} }
jfaud->Update(); jfaud->Update(false);
} }
@ -331,6 +331,7 @@ int xyzsound(short num, short i, long x, long y, long z)
JFAudMixerChannel *chan; JFAudMixerChannel *chan;
int r, global = 0; int r, global = 0;
float gain = 1.0, pitch = 1.0; float gain = 1.0, pitch = 1.0;
int sndist;
if (!jfaud || !havewave || if (!jfaud || !havewave ||
num >= NUM_SOUNDS || num >= NUM_SOUNDS ||
@ -370,11 +371,19 @@ int xyzsound(short num, short i, long x, long y, long z)
} else pitch = translatepitch(ps); } else pitch = translatepitch(ps);
} }
sndist = FindDistance3D((ps[screenpeek].oposx-SX),(ps[screenpeek].oposy-SY),(ps[screenpeek].oposz-SZ)>>4);
if( i >= 0 && (soundm[num]&16) == 0 && PN == MUSICANDSFX && SLT < 999 && (sector[SECT].lotag&0xff) < 9 )
sndist = divscale14(sndist,(SHT+1));
sndist += soundvo[num];
if(sndist < 0) sndist = 0;
//gain += soundvo[num]; //gain += soundvo[num];
if (PN != MUSICANDSFX && if (sndist && PN != MUSICANDSFX &&
!cansee(ps[screenpeek].oposx,ps[screenpeek].oposy,ps[screenpeek].oposz-(24<<8), !cansee(ps[screenpeek].oposx,ps[screenpeek].oposy,ps[screenpeek].oposz-(24<<8),
ps[screenpeek].cursectnum,SX,SY,SZ-(24<<8),SECT) ) ps[screenpeek].cursectnum,SX,SY,SZ-(24<<8),SECT) )
gain *= 1.0/32.0; gain *= 0.4;
switch(num) switch(num)
{ {
@ -540,6 +549,8 @@ void pan3dsound(void)
mix = jfaud->GetWave(); mix = jfaud->GetWave();
if (!mix) return; if (!mix) return;
jfaud->AgeCache();
if(ud.camerasprite == -1) { if(ud.camerasprite == -1) {
cx = ps[screenpeek].oposx; cx = ps[screenpeek].oposx;
cy = ps[screenpeek].oposy; cy = ps[screenpeek].oposy;
@ -559,6 +570,7 @@ void pan3dsound(void)
0.0, 1.0, 0.0); 0.0, 1.0, 0.0);
for (j=NumVoices-1; j>=0; j--) { for (j=NumVoices-1; j>=0; j--) {
int sndist;
if (!chans[j].chan || !jfaud->IsValidSound(chans[j].chan) || chans[j].owner < 0) continue; if (!chans[j].chan || !jfaud->IsValidSound(chans[j].chan) || chans[j].owner < 0) continue;
global = 0; global = 0;
@ -569,9 +581,23 @@ void pan3dsound(void)
sy = sprite[i].y; sy = sprite[i].y;
sz = sprite[i].z; sz = sprite[i].z;
if( PN == APLAYER && sprite[i].yvel == screenpeek)
{
sndist = 0;
}
else
{
sndist = FindDistance3D((cx-sx),(cy-sy),(cz-sz)>>4);
if( i >= 0 && (soundm[j]&16) == 0 && PN == MUSICANDSFX && SLT < 999 && (sector[SECT].lotag&0xff) < 9 )
sndist = divscale14(sndist,(SHT+1));
}
sndist += soundvo[j];
if(sndist < 0) sndist = 0;
//gain += soundvo[num]; //gain += soundvo[num];
if (PN != MUSICANDSFX && !cansee(cx,cy,cz-(24<<8),cs,sx,sy,sz-(24<<8),SECT) ) if (sndist && PN != MUSICANDSFX && !cansee(cx,cy,cz-(24<<8),cs,sx,sy,sz-(24<<8),SECT) )
gain *= 1.0/32.0; gain *= 0.4;
if(PN == MUSICANDSFX && SLT < 999) numenvsnds++; if(PN == MUSICANDSFX && SLT < 999) numenvsnds++;
if( soundm[ chans[j].soundnum ]&SOUNDM_GLOBAL ) global = 1; if( soundm[ chans[j].soundnum ]&SOUNDM_GLOBAL ) global = 1;
@ -599,7 +625,7 @@ void pan3dsound(void)
chans[j].chan->SetFollowListener(true); chans[j].chan->SetFollowListener(true);
chans[j].chan->SetPosition(0.0, 0.0, 0.0); chans[j].chan->SetPosition(0.0, 0.0, 0.0);
} else { } else {
chans[j].chan->SetRolloff(global ? 0.0 : 0.2); chans[j].chan->SetRolloff(global ? 0.0 : 0.1);
chans[j].chan->SetFollowListener(false); chans[j].chan->SetFollowListener(false);
chans[j].chan->SetPosition((float)sx/UNITSPERMETRE, (float)(-sz>>4)/UNITSPERMETRE, (float)sy/UNITSPERMETRE); chans[j].chan->SetPosition((float)sx/UNITSPERMETRE, (float)(-sz>>4)/UNITSPERMETRE, (float)sy/UNITSPERMETRE);
} }