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

Change the way sideplayer/playerchar ordering works to be stackUnder instead of Raise so it doesn't break anything (like the chatbox)

Browse Source
This commit is contained in:
Crystalwarrior 2019-09-16 23:54:42 +03:00
parent 19ff6cd5f8
commit 684e26cb77
1 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/courtroom.cpp
View File

@ -1635,16 +1635,12 @@ void Courtroom::handle_chatmessage_2()
// The person more to the left is more in the front. // The person more to the left is more in the front.
if (hor2_offset >= hor_offset) if (hor2_offset >= hor_offset)
{ {
ui_vp_sideplayer_char->raise(); ui_vp_sideplayer_char->stackUnder(ui_vp_player_char);
ui_vp_player_char->raise();
} }
else else
{ {
ui_vp_player_char->raise(); ui_vp_player_char->stackUnder(ui_vp_sideplayer_char);
ui_vp_sideplayer_char->raise();
} }
ui_vp_desk->raise();
ui_vp_legacy_desk->raise();
} }
else if (side == "pro") else if (side == "pro")
{ {
@ -1668,18 +1664,14 @@ void Courtroom::handle_chatmessage_2()
ui_vp_sideplayer_char->move(ui_viewport->width() * hor2_offset / 100, ui_viewport->height() * vert2_offset / 100); ui_vp_sideplayer_char->move(ui_viewport->width() * hor2_offset / 100, ui_viewport->height() * vert2_offset / 100);
// Finally, we reorder them based on who is more to the right. // Finally, we reorder them based on who is more to the right.
if (hor2_offset <= hor_offset) if (hor2_offset >= hor_offset)
{ {
ui_vp_sideplayer_char->raise(); ui_vp_sideplayer_char->stackUnder(ui_vp_player_char);
ui_vp_player_char->raise();
} }
else else
{ {
ui_vp_player_char->raise(); ui_vp_player_char->stackUnder(ui_vp_sideplayer_char);
ui_vp_sideplayer_char->raise();
} }
ui_vp_desk->raise();
ui_vp_legacy_desk->raise();
} }
else else
{ {
@ -1696,16 +1688,12 @@ void Courtroom::handle_chatmessage_2()
// The person more to the left is more in the front. // The person more to the left is more in the front.
if (hor2_offset >= hor_offset) if (hor2_offset >= hor_offset)
{ {
ui_vp_sideplayer_char->raise(); ui_vp_sideplayer_char->stackUnder(ui_vp_player_char);
ui_vp_player_char->raise();
} }
else else
{ {
ui_vp_player_char->raise(); ui_vp_player_char->stackUnder(ui_vp_sideplayer_char);
ui_vp_sideplayer_char->raise();
} }
ui_vp_desk->raise();
ui_vp_legacy_desk->raise();
} }
// We should probably also play the other character's idle emote. // We should probably also play the other character's idle emote.
if (ao_app->flipping_enabled && m_chatmessage[OTHER_FLIP].toInt() == 1) if (ao_app->flipping_enabled && m_chatmessage[OTHER_FLIP].toInt() == 1)