diff options
| author | Crystalwarrior <varsash@gmail.com> | 2019-09-24 13:29:08 +0300 |
|---|---|---|
| committer | Crystalwarrior <varsash@gmail.com> | 2019-09-24 13:29:08 +0300 |
| commit | 9911aeb5e6741279715f05d76c054907c58b47de (patch) | |
| tree | cdb5d66c45d23c7ed19a5b494c58c6f807b09bc0 /src/aocharmovie.cpp | |
| parent | fb6c5076aa61301d13766d7d9c607fa45e630ce5 (diff) | |
Fix an issue with AOCharmovie hanging on frame1 animations
Fix an issue with the logger screwing up the server folder name string if character ' was used
Diffstat (limited to 'src/aocharmovie.cpp')
| -rw-r--r-- | src/aocharmovie.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/aocharmovie.cpp b/src/aocharmovie.cpp index d764d1a5..e8dc8fc1 100644 --- a/src/aocharmovie.cpp +++ b/src/aocharmovie.cpp @@ -153,8 +153,12 @@ void AOCharMovie::play() { play_frame_effect(frame); if (max_frames <= 1) - return; - ticker->start(this->get_frame_delay(movie_delays[frame])); + { + play_once = true; + ticker->start(60); + } + else + ticker->start(this->get_frame_delay(movie_delays[frame])); } void AOCharMovie::play_pre(QString p_char, QString p_emote, int duration) @@ -281,7 +285,7 @@ void AOCharMovie::move(int ax, int ay) void AOCharMovie::movie_ticker() { ++frame; - if(frame == max_frames) + if(frame >= max_frames) { if(play_once) { |