Fix wrong precedence order for effects

This was causing the realization.png UI button to be loaded instead of the effect.
This commit is contained in:
oldmud0 2022-01-08 12:51:49 -06:00
parent c07ff35897
commit 3ec3d3a121

View File

@ -875,14 +875,15 @@ QString AOApplication::get_effect(QString effect, QString p_char,
if (p_folder == "")
p_folder = read_char_ini(p_char, "effects", "Options");
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);
QStringList paths {
get_image("effects/" + effect, current_theme, get_subtheme(), default_theme, ""),
get_image(effect, current_theme, get_subtheme(), default_theme, p_folder)
};
if (!file_exists(p_misc_path) && !file_exists(p_path))
return "";
else if (file_exists(p_misc_path))
return p_misc_path;
return p_path;
for (const auto &p : paths)
if (file_exists(p))
return p;
return {};
}
QString AOApplication::get_effect_property(QString fx_name, QString p_char,