mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-09-06 04:17:58 +00:00
Code Issues Releases Wiki Activity

work in progress for 10.0

Browse Source
This commit is contained in:
Zeno Rogue
2017-07-04 15:38:33 +02:00
parent 13043dc417
commit 22c9217219
34 changed files with 2051 additions and 1290 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sound.cpp
View File

@@ -69,9 +69,8 @@ void handlemusic() {
DEBB(DF_GRAPH, (debugfile,"handle music\n"));
if(audio && musicvolume) {
eLand id = getCurrentLandForMusic();
#ifdef LOCAL
extern bool local_changemusic(eLand& id);
if(local_changemusic(id)) return;
#ifdef EXTRA_MUSIC
if(extra::changemusic(id)) return;
#endif
if(outoffocus) id = eLand(0);
if(musfname[id] == "LAST") id = cid;
@@ -154,6 +153,7 @@ bool loadMusicInfo(string dir) {
bool loadMusicInfo() {
return
loadMusicInfo(musicfile)
|| loadMusicInfo(HYPERPATH "hyperrogue-music.txt")
|| loadMusicInfo("./hyperrogue-music.txt")
|| loadMusicInfo("music/hyperrogue-music.txt")
// Destination set by ./configure (in the GitHub repository)
@@ -187,7 +187,7 @@ map<string, Mix_Chunk*> chunks;
#ifdef SOUNDDESTDIR
string wheresounds = SOUNDDESTDIR;
#else
string wheresounds = "sounds/";
string wheresounds = HYPERPATH "sounds/";
#endif
void playSound(cell *c, const string& fname, int vol) {