aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCrystalwarrior <varsash@gmail.com>2019-09-25 03:39:32 +0300
committerCrystalwarrior <varsash@gmail.com>2019-09-25 03:39:32 +0300
commita028b8496e6684f89efc3b8bf7946fb5901faa99 (patch)
treee963e40dbee23c3cc48d128c0bd3480de71193ca
parent923548c99746858846764e47fa96899e7c5ef2ab (diff)
Fix objections botching up single frame preanims, etc.
-rw-r--r--src/aocharmovie.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/aocharmovie.cpp b/src/aocharmovie.cpp
index e8dc8fc1..5294b23c 100644
--- a/src/aocharmovie.cpp
+++ b/src/aocharmovie.cpp
@@ -154,8 +154,8 @@ void AOCharMovie::play()
play_frame_effect(frame);
if (max_frames <= 1)
{
- play_once = true;
- ticker->start(60);
+ if (play_once)
+ ticker->start(60);
}
else
ticker->start(this->get_frame_delay(movie_delays[frame]));
@@ -316,6 +316,7 @@ void AOCharMovie::movie_ticker()
void AOCharMovie::preanim_done()
{
+ ticker->stop();
preanim_timer->stop();
done();
}