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

Merge pull request #533 from AttorneyOnline/fix/regression-charlayer-path

Browse Source 
Fix regression that won't allow us to give a direct base/ path to a char emote
This commit is contained in:
oldmud0 2021-04-23 01:57:24 -05:00 committed by GitHub
commit b7585a1c6f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/aolayer.cpp
View File

@ -197,20 +197,20 @@ void CharLayer::load_image(QString p_filename, QString p_charname,
<< " continuous: " << continuous; << " continuous: " << continuous;
#endif #endif
QStringList pathlist = { QStringList pathlist = {
ao_app->get_image_suffix(ao_app->get_character_path( ao_app->get_character_path(
p_charname, prefix + current_emote)), // Default path p_charname, prefix + current_emote), // Default path
ao_app->get_image_suffix(ao_app->get_character_path( ao_app->get_character_path(
p_charname, p_charname,
prefix + "/" + current_emote)), // Path check if it's categorized prefix + "/" + current_emote), // Path check if it's categorized
// into a folder // into a folder
ao_app->get_image_suffix(ao_app->get_character_path( ao_app->get_character_path(
p_charname, p_charname,
current_emote)), // Just use the non-prefixed image, animated or not current_emote), // Just use the non-prefixed image, animated or not
ao_app->get_image_suffix( current_emote, // The path by itself after the above fail
ao_app->get_theme_path("placeholder")), // Theme placeholder path ao_app->get_theme_path("placeholder"), // Theme placeholder path
ao_app->get_image_suffix(ao_app->get_theme_path( ao_app->get_theme_path(
"placeholder", ao_app->default_theme))}; // Default theme placeholder path "placeholder", ao_app->default_theme)}; // Default theme placeholder path
start_playback(find_image(pathlist)); start_playback(ao_app->get_image_path(pathlist));
} }
void SplashLayer::load_image(QString p_filename, QString p_charname, void SplashLayer::load_image(QString p_filename, QString p_charname,

2
src/path_functions.cpp
View File

@ -105,7 +105,6 @@ QString AOApplication::get_evidence_path(QString p_file)
QStringList AOApplication::get_asset_paths(QString p_element, QString p_theme, QString p_subtheme, QString p_default_theme, QString p_misc, QString p_character, QString p_placeholder) QStringList AOApplication::get_asset_paths(QString p_element, QString p_theme, QString p_subtheme, QString p_default_theme, QString p_misc, QString p_character, QString p_placeholder)
{ {
QStringList pathlist; QStringList pathlist;
pathlist += p_element; // The path by itself
if (p_character != "") if (p_character != "")
pathlist += get_character_path(p_character, p_element); // Character folder pathlist += get_character_path(p_character, p_element); // Character folder
if (p_misc != "" && p_theme != "" && p_subtheme != "") if (p_misc != "" && p_theme != "" && p_subtheme != "")
@ -120,6 +119,7 @@ QStringList AOApplication::get_asset_paths(QString p_element, QString p_theme, Q
pathlist += get_theme_path(p_element, p_theme); // Theme path pathlist += get_theme_path(p_element, p_theme); // Theme path
if (p_default_theme != "") if (p_default_theme != "")
pathlist += get_theme_path(p_element, p_default_theme); // Default theme path pathlist += get_theme_path(p_element, p_default_theme); // Default theme path
pathlist += p_element; // The path by itself
if (p_placeholder != "" && p_theme != "") if (p_placeholder != "" && p_theme != "")
pathlist += get_theme_path(p_placeholder, p_theme); // Placeholder path pathlist += get_theme_path(p_placeholder, p_theme); // Placeholder path
if (p_placeholder != "" && p_default_theme != "") if (p_placeholder != "" && p_default_theme != "")