diff options
| author | oldmud0 <oldmud0@users.noreply.github.com> | 2018-11-09 23:04:19 -0600 |
|---|---|---|
| committer | oldmud0 <oldmud0@users.noreply.github.com> | 2018-11-10 12:36:12 -0600 |
| commit | c7a58f89b1b5fbc7179b89a7300c3d1a2f7ba6cc (patch) | |
| tree | 3b7fc120e9653a79fee1531776495b1ab4f6bfa7 /aomovie.cpp | |
| parent | 3ef743da7b8071e0dc4b1189cbe131f65f11b5de (diff) | |
| parent | 57736ad24b63962424afba16edfe792427b223d6 (diff) | |
Initial merge of Case Cafe 1.4.1 into mainline
Diffstat (limited to 'aomovie.cpp')
| -rw-r--r-- | aomovie.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/aomovie.cpp b/aomovie.cpp index 90c37010..d7727aa6 100644 --- a/aomovie.cpp +++ b/aomovie.cpp @@ -32,13 +32,16 @@ void AOMovie::play(QString p_gif, QString p_char, QString p_custom_theme) else custom_path = ao_app->get_character_path(p_char) + p_gif + "_bubble.gif"; + QString misc_path = ao_app->get_base_path() + "misc/" + p_custom_theme + "/" + p_gif + "_bubble.gif"; 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"; - if (file_exists(custom_path)) + if (file_exists(misc_path)) + gif_path = misc_path; + else if (file_exists(custom_path)) gif_path = custom_path; else if (file_exists(custom_theme_path)) gif_path = custom_theme_path; |