aboutsummaryrefslogtreecommitdiff
path: root/aomovie.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'aomovie.cpp')
-rw-r--r--aomovie.cpp17
1 files changed, 10 insertions, 7 deletions
diff --git a/aomovie.cpp b/aomovie.cpp
index 90c37010..edf5bdb0 100644
--- a/aomovie.cpp
+++ b/aomovie.cpp
@@ -28,18 +28,21 @@ void AOMovie::play(QString p_gif, QString p_char, QString p_custom_theme)
QString custom_path;
if (p_gif == "custom")
- custom_path = ao_app->get_character_path(p_char) + p_gif + ".gif";
+ custom_path = ao_app->get_image_suffix(ao_app->get_character_path(p_char, p_gif));
else
- custom_path = ao_app->get_character_path(p_char) + p_gif + "_bubble.gif";
+ custom_path = ao_app->get_image_suffix(ao_app->get_character_path(p_char, p_gif + "_bubble"));
- QString custom_theme_path = ao_app->get_base_path() + "themes/" + p_custom_theme + "/" + p_gif + ".gif";
- QString theme_path = ao_app->get_theme_path() + p_gif + ".gif";
- QString default_theme_path = ao_app->get_default_theme_path() + p_gif + ".gif";
- QString placeholder_path = ao_app->get_theme_path() + "placeholder.gif";
- QString default_placeholder_path = ao_app->get_default_theme_path() + "placeholder.gif";
+ QString misc_path = ao_app->get_base_path() + "misc/" + p_custom_theme + "/" + p_gif + "_bubble.gif";
+ QString custom_theme_path = ao_app->get_custom_theme_path(p_custom_theme, p_gif + ".gif");
+ QString theme_path = ao_app->get_theme_path(p_gif + ".gif");
+ QString default_theme_path = ao_app->get_default_theme_path(p_gif + ".gif");
+ QString placeholder_path = ao_app->get_theme_path("placeholder.gif");
+ QString default_placeholder_path = ao_app->get_default_theme_path("placeholder.gif");
if (file_exists(custom_path))
gif_path = custom_path;
+ else if (file_exists(misc_path))
+ gif_path = misc_path;
else if (file_exists(custom_theme_path))
gif_path = custom_theme_path;
else if (file_exists(theme_path))