aboutsummaryrefslogtreecommitdiff
path: root/src/courtroom.cpp
diff options
context:
space:
mode:
authorCrystalwarrior <varsash@gmail.com>2019-09-12 19:37:44 +0300
committerCrystalwarrior <varsash@gmail.com>2019-09-12 22:46:06 +0300
commit3b3507df60673079482372b4da08eeabf9317a20 (patch)
tree5761ede5975db859c3a5a9215ba85a50a5b7562f /src/courtroom.cpp
parent5a31516a36e0f13211db807a48214f11ccef827d (diff)
Fix compilation error
Allow realization flashes to be animated images by making them AOMovies Eploit the newly added 'duration' system for realization AOMovie (cherry picked from commit bb98f79083648243216f665852a7d2326af11be0)
Diffstat (limited to 'src/courtroom.cpp')
-rw-r--r--src/courtroom.cpp18
1 files changed, 3 insertions, 15 deletions
diff --git a/src/courtroom.cpp b/src/courtroom.cpp
index c82f6f2e..5ae71f8e 100644
--- a/src/courtroom.cpp
+++ b/src/courtroom.cpp
@@ -55,9 +55,6 @@ Courtroom::Courtroom(AOApplication *p_ao_app) : QMainWindow()
sfx_delay_timer = new QTimer(this);
sfx_delay_timer->setSingleShot(true);
- realization_timer = new QTimer(this);
- realization_timer->setSingleShot(true);
-
music_player = new AOMusicPlayer(this, ao_app);
music_player->set_volume(0);
@@ -97,7 +94,7 @@ Courtroom::Courtroom(AOApplication *p_ao_app) : QMainWindow()
ui_vp_testimony = new AOMovie(this, ao_app);
ui_vp_testimony->set_play_once(false);
- ui_vp_realization = new AOImage(this, ao_app);
+ ui_vp_realization = new AOMovie(this, ao_app);
ui_vp_wtce = new AOMovie(this, ao_app);
ui_vp_objection = new AOMovie(this, ao_app);
@@ -273,8 +270,6 @@ Courtroom::Courtroom(AOApplication *p_ao_app) : QMainWindow()
connect(chat_tick_timer, SIGNAL(timeout()), this, SLOT(chat_tick()));
- connect(realization_timer, SIGNAL(timeout()), this, SLOT(realization_done()));
-
connect(ui_emote_left, SIGNAL(clicked()), this, SLOT(on_emote_left_clicked()));
connect(ui_emote_right, SIGNAL(clicked()), this, SLOT(on_emote_right_clicked()));
@@ -487,9 +482,7 @@ void Courtroom::set_widgets()
ui_vp_testimony->combo_resize(ui_viewport->width(), ui_viewport->height());
ui_vp_realization->move(ui_viewport->x(), ui_viewport->y());
- ui_vp_realization->resize(ui_viewport->width(), ui_viewport->height());
- ui_vp_realization->set_image("realizationflash.png");
- ui_vp_realization->hide();
+ ui_vp_realization->combo_resize(ui_viewport->width(), ui_viewport->height());
ui_vp_wtce->move(ui_viewport->x(), ui_viewport->y());
ui_vp_wtce->combo_resize(ui_viewport->width(), ui_viewport->height());
@@ -1972,10 +1965,6 @@ void Courtroom::preanim_done()
handle_chatmessage_3();
}
-void Courtroom::realization_done()
-{
- ui_vp_realization->hide();
-}
void Courtroom::start_chat_ticking()
{
@@ -1985,8 +1974,7 @@ void Courtroom::start_chat_ticking()
if (m_chatmessage[REALIZATION] == "1")
{
- realization_timer->start(60);
- ui_vp_realization->show();
+ ui_vp_realization->play("realizationflash", "", "", 60);
sfx_player->play(ao_app->get_custom_realization(m_chatmessage[CHAR_NAME]));
}