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

adjusted functions to reflect change in get_case_sensitive_path

Browse Source
This commit is contained in:
David Skoland 2018-11-17 20:26:12 +01:00
parent fddb72950e
commit 027f95decc
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
path_functions.cpp
View File

@ -52,7 +52,6 @@ QString AOApplication::get_default_theme_path(QString p_file)
#endif #endif
} }
//assume that the capitalization of the theme in config is correct
QString AOApplication::get_theme_path(QString p_file) QString AOApplication::get_theme_path(QString p_file)
{ {
QString path = get_base_path() + "themes/" + current_theme + "/" + p_file; QString path = get_base_path() + "themes/" + current_theme + "/" + p_file;
@ -95,17 +94,15 @@ QString AOApplication::get_music_path(QString p_song)
QString AOApplication::get_background_path(QString p_file) QString AOApplication::get_background_path(QString p_file)
{ {
QString bg_path = get_base_path() + "background/" + w_courtroom->get_current_background(); QString path = get_base_path() + "background/" + w_courtroom->get_current_background() + "/" + p_file;
if (courtroom_constructed) { if (courtroom_constructed) {
#ifndef CASE_SENSITIVE_FILESYSTEM #ifndef CASE_SENSITIVE_FILESYSTEM
return bg_path + "/" + p_file; return path;
#else #else
return get_case_sensitive_path( return get_case_sensitive_path(path);
get_case_sensitive_path(bg_path) + "/" + p_file);
#endif #endif
} }
//this function being called when the courtroom isn't constructed makes no sense return get_default_background_path(p_file);
return "";
} }
QString AOApplication::get_default_background_path(QString p_file) QString AOApplication::get_default_background_path(QString p_file)