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

Merge pull request #552 from AttorneyOnline/fix/effects2

Browse Source 
Account for the difference between theme and misc pathing when getting image and sound data for effects
This commit is contained in:
oldmud0 2021-05-16 17:32:39 -05:00 committed by GitHub
commit e3730b5497
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/text_file_functions.cpp
View File

@ -868,10 +868,13 @@ QString AOApplication::get_effect(QString effect, QString p_char,
if (p_folder == "") if (p_folder == "")
p_folder = read_char_ini(p_char, "effects", "Options"); p_folder = read_char_ini(p_char, "effects", "Options");
QString p_path = get_image("effects/" + effect, current_theme, get_subtheme(), default_theme, p_folder); QString p_path = get_image("effects/" + effect, current_theme, get_subtheme(), default_theme, "");
QString p_misc_path = get_image(effect, current_theme, get_subtheme(), default_theme, p_folder);
if (!file_exists(p_path)) if (!file_exists(p_misc_path) && !file_exists(p_path))
return ""; return "";
else if (file_exists(p_misc_path))
return p_misc_path;
return p_path; return p_path;
} }
@ -884,7 +887,9 @@ QString AOApplication::get_effect_property(QString fx_name, QString p_char,
else else
f_property = fx_name + "_" + p_property; f_property = fx_name + "_" + p_property;
QString f_result = get_config_value(f_property, "effects/effects.ini", current_theme, get_subtheme(), default_theme, read_char_ini(p_char, "effects", "Options")); QString f_result = get_config_value(f_property, "effects.ini", current_theme, get_subtheme(), default_theme, read_char_ini(p_char, "effects", "Options"));
if (f_result == "")
f_result = get_config_value(f_property, "effects/effects.ini", current_theme, get_subtheme(), default_theme, "");
if (fx_name == "realization" && p_property == "sound") { if (fx_name == "realization" && p_property == "sound") {
f_result = get_custom_realization(p_char); f_result = get_custom_realization(p_char);
} }