diff options
| author | Crystalwarrior <varsash@gmail.com> | 2019-09-13 12:00:27 +0300 |
|---|---|---|
| committer | Crystalwarrior <varsash@gmail.com> | 2019-09-13 12:00:27 +0300 |
| commit | ab072132c30148bd7d16cfb6cbe0a8e35684d9d4 (patch) | |
| tree | cfb4b027f590e1a5c224e9ccfcd5e52d763ac294 /src/aomovie.cpp | |
| parent | bb8edab5798be59476557c0eae2b6aa1f4257448 (diff) | |
| parent | 86523bb101e73417e44eaae71e6cac5a11a70751 (diff) | |
Merge branch 'aomovies'
# Conflicts:
# include/aomovie.h
# src/aomovie.cpp
# src/courtroom.cpp
Diffstat (limited to 'src/aomovie.cpp')
| -rw-r--r-- | src/aomovie.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/aomovie.cpp b/src/aomovie.cpp index 726a5159..851ae570 100644 --- a/src/aomovie.cpp +++ b/src/aomovie.cpp @@ -29,7 +29,7 @@ void AOMovie::start_timer(int delay) timer->start(delay); } -void AOMovie::play(QString p_gif, QString p_char, QString p_custom_theme, int duration) +void AOMovie::play(QString p_image, QString p_char, QString p_custom_theme, int duration) { m_movie->stop(); @@ -37,19 +37,19 @@ void AOMovie::play(QString p_gif, QString p_char, QString p_custom_theme, int du QList<QString> pathlist; pathlist = { - ao_app->get_image_suffix(ao_app->get_base_path() + "misc/" + p_custom_theme + "/" + p_gif + "_bubble"), //Misc path - ao_app->get_image_suffix(ao_app->get_custom_theme_path(p_custom_theme, p_gif)), //Custom theme path - ao_app->get_image_suffix(ao_app->get_theme_path(p_gif)), //Theme path - ao_app->get_image_suffix(ao_app->get_default_theme_path(p_gif)), //Default theme path + ao_app->get_image_suffix(ao_app->get_base_path() + "misc/" + p_custom_theme + "/" + p_image + "_bubble"), //Misc path + ao_app->get_image_suffix(ao_app->get_custom_theme_path(p_custom_theme, p_image)), //Custom theme path + ao_app->get_image_suffix(ao_app->get_theme_path(p_image)), //Theme path + ao_app->get_image_suffix(ao_app->get_default_theme_path(p_image)), //Default theme path ao_app->get_image_suffix(ao_app->get_theme_path("placeholder")), //Placeholder path ao_app->get_image_suffix( ao_app->get_default_theme_path("placeholder")), //Default placeholder path }; //Add this at the beginning of the list - order matters. - if (p_gif == "custom") - pathlist.prepend(ao_app->get_image_suffix(ao_app->get_character_path(p_char, p_gif))); + if (p_image == "custom") + pathlist.prepend(ao_app->get_image_suffix(ao_app->get_character_path(p_char, p_image))); else - pathlist.prepend(ao_app->get_image_suffix(ao_app->get_character_path(p_char, p_gif + "_bubble"))); + pathlist.prepend(ao_app->get_image_suffix(ao_app->get_character_path(p_char, p_image + "_bubble"))); for (QString path : pathlist) { |