diff options
| author | oldmud0 <oldmud0@users.noreply.github.com> | 2018-11-10 23:50:51 -0600 |
|---|---|---|
| committer | oldmud0 <oldmud0@users.noreply.github.com> | 2018-11-10 23:50:51 -0600 |
| commit | 33cae53665ef2a1a0db8cf664faca0faf08770f6 (patch) | |
| tree | 63bd31d7f0a64693b124e8f0858f3423184ea635 /aocharmovie.cpp | |
| parent | de9bdceec73a7228c44e189e4bc141c721488586 (diff) | |
Merge AOV 2.5.1 into mainline
Diffstat (limited to 'aocharmovie.cpp')
| -rw-r--r-- | aocharmovie.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/aocharmovie.cpp b/aocharmovie.cpp index 41708550..e9c88bae 100644 --- a/aocharmovie.cpp +++ b/aocharmovie.cpp @@ -21,11 +21,14 @@ void AOCharMovie::play(QString p_char, QString p_emote, QString emote_prefix) { QString original_path = ao_app->get_character_path(p_char) + emote_prefix + p_emote.toLower() + ".gif"; QString alt_path = ao_app->get_character_path(p_char) + p_emote.toLower() + ".png"; + QString apng_path = ao_app->get_character_path(p_char) + emote_prefix + p_emote.toLower() + ".apng"; QString placeholder_path = ao_app->get_theme_path() + "placeholder.gif"; QString placeholder_default_path = ao_app->get_default_theme_path() + "placeholder.gif"; QString gif_path; - if (file_exists(original_path)) + if (file_exists(apng_path)) + gif_path = apng_path; + else if (file_exists(original_path)) gif_path = original_path; else if (file_exists(alt_path)) gif_path = alt_path; @@ -155,6 +158,7 @@ void AOCharMovie::move(int ax, int ay) void AOCharMovie::frame_change(int n_frame) { + if (movie_frames.size() > n_frame) { QPixmap f_pixmap = QPixmap::fromImage(movie_frames.at(n_frame)); |