walkero
/
starfighter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Further adjusted amplification difference, fixed makefile problems.

This commit is contained in:
Layla Marchant 2021-04-02 00:15:29 -04:00
parent 8241e13d77
commit 50989a83e7
No known key found for this signature in database
GPG Key ID: 52FB5C20A8336782
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
music/Makefile.am
View File

@ -6,12 +6,12 @@
musicdir = $(pkgdatadir)/music musicdir = $(pkgdatadir)/music
nobase_dist_music_DATA = \ nobase_dist_music_DATA = \
death.ogg \
frozen_jam.ogg \ frozen_jam.ogg \
last_cyber_dance.ogg \ last_cyber_dance.ogg \
orbital_colossus.ogg \ orbital_colossus.ogg \
railjet_short.ogg \ railjet_short.ogg \
RE.ogg \ RE.ogg \
reremix.ogg \
rise_of_spirit.ogg \ rise_of_spirit.ogg \
sound_and_silence.ogg \ sound_and_silence.ogg \
space_dimensions.ogg \ space_dimensions.ogg \

4
src/audio.c
View File

@ -66,7 +66,7 @@ void audio_playSound(int sid, float x, float y)
int angle = atanf((x - (screen->w / 2)) / (screen->w / 2)) * 180 / M_PI; int angle = atanf((x - (screen->w / 2)) / (screen->w / 2)) * 180 / M_PI;
int attenuation = fabsf(x - (screen->w / 2)) / (screen->w / 20); int attenuation = fabsf(x - (screen->w / 2)) / (screen->w / 20);
float distance = sqrtf(powf(fabsf(x - (screen->w / 2)), 2) + powf(fabsf(y - (screen->h / 2)), 2)); float distance = sqrtf(powf(fabsf(x - (screen->w / 2)), 2) + powf(fabsf(y - (screen->h / 2)), 2));
const int max_volume = MIX_MAX_VOLUME / 2; const int max_volume = MIX_MAX_VOLUME / 4;
int volume = max_volume - (max_volume * distance / (3 * screen->w)); int volume = max_volume - (max_volume * distance / (3 * screen->w));
if ((!engine.useSound) || (!engine.useAudio) || (volume <= 0)) if ((!engine.useSound) || (!engine.useAudio) || (volume <= 0))
@ -177,7 +177,7 @@ void audio_playMusic(const char *filename, int loops, int amplified)
{ {
audio_haltMusic(); audio_haltMusic();
music = Mix_LoadMUS(filename); music = Mix_LoadMUS(filename);
audio_setMusicVolume(amplified ? MIX_MAX_VOLUME : MIX_MAX_VOLUME / 2); audio_setMusicVolume(amplified ? MIX_MAX_VOLUME : MIX_MAX_VOLUME / 4);
Mix_PlayMusic(music, loops); Mix_PlayMusic(music, loops);
} }
#endif #endif