diff options
| author | David Skoland <davidskoland@gmail.com> | 2017-02-15 23:16:03 +0100 |
|---|---|---|
| committer | David Skoland <davidskoland@gmail.com> | 2017-02-15 23:16:03 +0100 |
| commit | 9ec69c2d2fbd19511b8d51e83fbe5b5e61909deb (patch) | |
| tree | 7895da6e328deef1a3d0c23d2b2e6effa9fdce85 | |
| parent | eb2c0b1b4ab5370c332f046fd84cc8afbfe0c658 (diff) | |
stuff?
| -rw-r--r-- | Attorney_Online_remake.pro | 2 | ||||
| -rw-r--r-- | courtroom.cpp | 14 |
2 files changed, 9 insertions, 7 deletions
diff --git a/Attorney_Online_remake.pro b/Attorney_Online_remake.pro index 0d7c8eed..d132cfcd 100644 --- a/Attorney_Online_remake.pro +++ b/Attorney_Online_remake.pro @@ -13,7 +13,7 @@ RC_ICONS = logo.ico TARGET = Attorney_Online_remake TEMPLATE = app -VERSION = 2.1.7.0 +VERSION = 2.1.8.0 SOURCES += main.cpp\ lobby.cpp \ diff --git a/courtroom.cpp b/courtroom.cpp index 7578c14a..02b5b169 100644 --- a/courtroom.cpp +++ b/courtroom.cpp @@ -1205,6 +1205,13 @@ void Courtroom::play_preanim() QString f_char = m_chatmessage[CHAR_NAME]; QString f_preanim = m_chatmessage[PRE_EMOTE]; + //all time values in char.inis are multiplied by a constant(time_mod) to get the actual time + int preanim_duration = ao_app->get_ao2_preanim_duration(f_char, f_preanim) * time_mod; + int text_delay = ao_app->get_text_delay(f_char, f_preanim) * time_mod; + int sfx_delay = m_chatmessage[SFX_DELAY].toInt() * time_mod; + + sfx_delay_timer->start(sfx_delay); + if (!file_exists(ao_app->get_character_path(f_char) + f_preanim.toLower() + ".gif")) { anim_state = 1; @@ -1213,16 +1220,11 @@ void Courtroom::play_preanim() return; } - //all time values in char.inis are multiplied by a constant(time_mod) to get the actual time - int preanim_duration = ao_app->get_ao2_preanim_duration(f_char, f_preanim) * time_mod; - int text_delay = ao_app->get_text_delay(f_char, f_preanim) * time_mod; - int sfx_delay = m_chatmessage[SFX_DELAY].toInt() * time_mod; - ui_vp_player_char->play_pre(f_char, f_preanim, preanim_duration); anim_state = 1; if (text_delay >= 0) text_delay_timer->start(text_delay); - sfx_delay_timer->start(sfx_delay); + } void Courtroom::preanim_done() |