aboutsummaryrefslogtreecommitdiff
path: root/src/aocharmovie.cpp
diff options
context:
space:
mode:
authorCrystalwarrior <varsash@gmail.com>2019-10-12 01:43:48 +0300
committerCrystalwarrior <varsash@gmail.com>2019-10-12 01:43:48 +0300
commit330aa9755095cd4f12f028452d268c50311d3710 (patch)
treeb5fb6bf39032266db2151cd118c0cee71459558c /src/aocharmovie.cpp
parent990f653e4a063a684b5d5584c7454c36a1036a85 (diff)
Properly handle "true song name" even with folders/categories and file formats (paving way for folder-categorized music lists set up by servers)
Prevent BG's from falling back on default BG path (this isn't really user-convenient and causes more trouble than its worth, e.g. stands appearing on BG's that dont' want stands to appear) Implement Case Cafe's method of categorization for (a) and (b) emotes
Diffstat (limited to 'src/aocharmovie.cpp')
-rw-r--r--src/aocharmovie.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/aocharmovie.cpp b/src/aocharmovie.cpp
index b05d7f64..9bbb8761 100644
--- a/src/aocharmovie.cpp
+++ b/src/aocharmovie.cpp
@@ -28,6 +28,7 @@ void AOCharMovie::load_image(QString p_char, QString p_emote, QString emote_pref
QList<QString> pathlist;
pathlist = {
ao_app->get_image_suffix(ao_app->get_character_path(p_char, emote_prefix + p_emote)), //Default path
+ ao_app->get_image_suffix(ao_app->get_character_path(p_char, emote_prefix + "/" + p_emote)),//Path check if it's categorized into a folder
ao_app->get_character_path(p_char, p_emote + ".png"), //Non-animated path if emote_prefix fails
ao_app->get_image_suffix(ao_app->get_theme_path("placeholder")), //Theme placeholder path
ao_app->get_image_suffix(ao_app->get_default_theme_path("placeholder")), //Default theme placeholder path