From 02b03d8eceee5c9cf9e0083d8ae7500eba0feb24 Mon Sep 17 00:00:00 2001 From: Zeno Rogue Date: Sun, 17 Aug 2025 20:58:44 +0200 Subject: [PATCH] fix music_file not finding --- help.cpp | 2 +- sound.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/help.cpp b/help.cpp index bf04c438..7b54b763 100644 --- a/help.cpp +++ b/help.cpp @@ -244,7 +244,7 @@ EX void buildCredits() { "Triple_Agent_AAA, bluetailedgnat, Allalinor, Shitford, KittyTac, Christopher King, KosGD, TravelDemon, Bubbles, rdococ, frozenlake, MagmaMcFry, " "Snakebird Priestess, roaringdragon2, Stopping Dog, bengineer8, Sir Light IJIJ, ShadeBlade, Saplou, shnourok, Ralith, madasa, 6% remaining, Chimera245, Remik Pi, alien foxcat thing, " "Piotr Grochowski, Ann, still-flow, tyzone, Paradoxica, LottieRatWorld, aismallard, albatross, EncodedSpirit, Jacob Mandelson, CrashTuvai, cvoight, jennlbw, Kali Ranya, spiritbackup, Dylan, L_Lord, AntiRogue, " - "masonlgreen, A human, Pasu4, inbetween selves, CodeParade, Existentialistic, blejanre, Esme" + "masonlgreen, A human, Pasu4, inbetween selves, CodeParade, Existentialistic, blejanre, Esme, Joshua Murphy" ); #ifdef EXTRALICENSE help += EXTRALICENSE; diff --git a/sound.cpp b/sound.cpp index 5c6aa4a2..eb125a9e 100644 --- a/sound.cpp +++ b/sound.cpp @@ -201,7 +201,7 @@ EX bool loadMusicInfo(string dir) { EX bool loadMusicInfo() { return - loadMusicInfo(find_file(musicfile)) + (musicfile[0] && loadMusicInfo(find_file(musicfile))) || loadMusicInfo(find_file("hyperrogue-music.txt") ) || loadMusicInfo(find_file("music/hyperrogue-music.txt") ) #ifdef FHS