Mamanyonyo/atrooney-online-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

stuff?

Browse Source
This commit is contained in:
David Skoland 2017-02-15 23:16:03 +01:00
parent eb2c0b1b4a
commit 9ec69c2d2f
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Attorney_Online_remake.pro
View File

@ -13,7 +13,7 @@ RC_ICONS = logo.ico
TARGET = Attorney_Online_remake TARGET = Attorney_Online_remake
TEMPLATE = app TEMPLATE = app
VERSION = 2.1.7.0 VERSION = 2.1.8.0
SOURCES += main.cpp\ SOURCES += main.cpp\
lobby.cpp \ lobby.cpp \

14
courtroom.cpp
View File

@ -1205,6 +1205,13 @@ void Courtroom::play_preanim()
QString f_char = m_chatmessage[CHAR_NAME]; QString f_char = m_chatmessage[CHAR_NAME];
QString f_preanim = m_chatmessage[PRE_EMOTE]; 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")) if (!file_exists(ao_app->get_character_path(f_char) + f_preanim.toLower() + ".gif"))
{ {
anim_state = 1; anim_state = 1;
@ -1213,16 +1220,11 @@ void Courtroom::play_preanim()
return; 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); ui_vp_player_char->play_pre(f_char, f_preanim, preanim_duration);
anim_state = 1; anim_state = 1;
if (text_delay >= 0) if (text_delay >= 0)
text_delay_timer->start(text_delay); text_delay_timer->start(text_delay);
sfx_delay_timer->start(sfx_delay);
} }
void Courtroom::preanim_done() void Courtroom::preanim_done()