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

Fix evidence display viewport element being a FUCKING JACKASS

Browse Source
This commit is contained in:
Crystalwarrior 2020-04-02 23:10:54 +03:00
parent 71ebdac1c1
commit e0ae7c0eb5
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/aoevidencedisplay.cpp
View File

@ -21,10 +21,6 @@ void AOEvidenceDisplay::show_evidence(QString p_evidence_image, bool is_left_sid
sfx_player->set_volume(p_volume); sfx_player->set_volume(p_volume);
QString f_evidence_path = ao_app->get_evidence_path(p_evidence_image);
QPixmap f_pixmap(f_evidence_path);
QString final_gif_path; QString final_gif_path;
QString gif_name; QString gif_name;
QString icon_identifier; QString icon_identifier;
@ -40,12 +36,15 @@ void AOEvidenceDisplay::show_evidence(QString p_evidence_image, bool is_left_sid
gif_name = "evidence_appear_right"; gif_name = "evidence_appear_right";
} }
QString f_evidence_path = ao_app->get_evidence_path(p_evidence_image);
QPixmap f_pixmap(f_evidence_path);
pos_size_type icon_dimensions = ao_app->get_element_dimensions(icon_identifier, "courtroom_design.ini"); pos_size_type icon_dimensions = ao_app->get_element_dimensions(icon_identifier, "courtroom_design.ini");
f_pixmap = f_pixmap.scaled(icon_dimensions.width, icon_dimensions.height);
evidence_icon->setPixmap(f_pixmap);
evidence_icon->resize(f_pixmap.size());
evidence_icon->move(icon_dimensions.x, icon_dimensions.y); evidence_icon->move(icon_dimensions.x, icon_dimensions.y);
evidence_icon->resize(icon_dimensions.width, icon_dimensions.height);
evidence_icon->setPixmap(f_pixmap.scaled(evidence_icon->width(), evidence_icon->height(), Qt::IgnoreAspectRatio));
evidence_movie->play(gif_name); evidence_movie->play(gif_name);
sfx_player->play(ao_app->get_sfx("evidence_present")); sfx_player->play(ao_app->get_sfx("evidence_present"));

2
src/courtroom.cpp
View File

@ -85,7 +85,7 @@ Courtroom::Courtroom(AOApplication *p_ao_app) : QMainWindow()
ui_vp_desk = new AOScene(ui_viewport, ao_app); ui_vp_desk = new AOScene(ui_viewport, ao_app);
ui_vp_legacy_desk = new AOScene(ui_viewport, ao_app); ui_vp_legacy_desk = new AOScene(ui_viewport, ao_app);
ui_vp_evidence_display = new AOEvidenceDisplay(this, ao_app); ui_vp_evidence_display = new AOEvidenceDisplay(ui_viewport, ao_app);
ui_vp_chatbox = new AOImage(this, ao_app); ui_vp_chatbox = new AOImage(this, ao_app);
ui_vp_showname = new QLabel(ui_vp_chatbox); ui_vp_showname = new QLabel(ui_vp_chatbox);