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/aocharmovie.cpp | |
| parent | bb8edab5798be59476557c0eae2b6aa1f4257448 (diff) | |
| parent | 86523bb101e73417e44eaae71e6cac5a11a70751 (diff) | |
Merge branch 'aomovies'
# Conflicts:
# include/aomovie.h
# src/aomovie.cpp
# src/courtroom.cpp
Diffstat (limited to 'src/aocharmovie.cpp')
| -rw-r--r-- | src/aocharmovie.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/aocharmovie.cpp b/src/aocharmovie.cpp index 23da710a..90baa555 100644 --- a/src/aocharmovie.cpp +++ b/src/aocharmovie.cpp @@ -61,11 +61,11 @@ void AOCharMovie::play(QString p_char, QString p_emote, QString emote_prefix) void AOCharMovie::play_pre(QString p_char, QString p_emote, int duration) { - QString gif_path = ao_app->get_character_path(p_char, p_emote); + QString emote_path = ao_app->get_character_path(p_char, p_emote); m_movie->stop(); this->clear(); - m_movie->setFileName(gif_path); + m_movie->setFileName(emote_path); m_movie->jumpToFrame(0); int full_duration = duration * time_mod; @@ -116,11 +116,11 @@ void AOCharMovie::play_pre(QString p_char, QString p_emote, int duration) void AOCharMovie::play_talking(QString p_char, QString p_emote) { - QString gif_path = ao_app->get_character_path(p_char, "(b)" + p_emote); + QString emote_path = ao_app->get_character_path(p_char, "(b)" + p_emote); m_movie->stop(); this->clear(); - m_movie->setFileName(gif_path); + m_movie->setFileName(emote_path); play_once = false; m_movie->setSpeed(100); @@ -129,11 +129,11 @@ void AOCharMovie::play_talking(QString p_char, QString p_emote) void AOCharMovie::play_idle(QString p_char, QString p_emote) { - QString gif_path = ao_app->get_character_path(p_char, "(a)" + p_emote); + QString emote_path = ao_app->get_character_path(p_char, "(a)" + p_emote); m_movie->stop(); this->clear(); - m_movie->setFileName(gif_path); + m_movie->setFileName(emote_path); play_once = false; m_movie->setSpeed(100); |