Mamanyonyo/atrooney-online-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix syntax error from unclean merge

Browse Source
This commit is contained in:
oldmud0 2020-05-02 21:44:34 -05:00 committed by GitHub
parent bbdad2a40d
commit e9940c82bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/path_functions.cpp
View File

@ -100,7 +100,7 @@ QString AOApplication::get_music_path(QString p_song)
//it's an URL //it's an URL
return p_song; return p_song;
} }
else if (file_exists(opus_check)) else if (file_exists(opus_check)) {
#ifndef CASE_SENSITIVE_FILESYSTEM #ifndef CASE_SENSITIVE_FILESYSTEM
return opus_check; return opus_check;
#else #else
@ -123,7 +123,6 @@ QString AOApplication::get_music_path(QString p_song)
} }
#ifndef CASE_SENSITIVE_FILESYSTEM #ifndef CASE_SENSITIVE_FILESYSTEM
return get_base_path() + "sounds/music/" + p_song + ".wav"; return get_base_path() + "sounds/music/" + p_song + ".wav";
;
#else #else
return get_case_sensitive_path(get_base_path() + "sounds/music/" + p_song + return get_case_sensitive_path(get_base_path() + "sounds/music/" + p_song +
".wav"); ".wav");