From cc1afbe30ec154a146ebb663da1319fe04cd4a40 Mon Sep 17 00:00:00 2001 From: in1tiate <32779090+in1tiate@users.noreply.github.com> Date: Sat, 7 Mar 2020 01:49:54 -0600 Subject: [PATCH 1/2] add support for 2.4-style chatboxes --- src/courtroom.cpp | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/courtroom.cpp b/src/courtroom.cpp index b9686e7..3d85c30 100644 --- a/src/courtroom.cpp +++ b/src/courtroom.cpp @@ -1655,7 +1655,21 @@ void Courtroom::handle_chatmessage_2() ui_vp_chatbox->set_image("chatmed.png"); else { - QString chatbox_path = ao_app->get_base_path() + "misc/" + chatbox + "/chatbox.png"; + QString chatbox_path; + QString misc_path = ao_app->get_base_path() + "misc/" + chatbox + "/chatbox.png"; + // support for 2.4 legacy chatboxes + QString legacy_path = ao_app->get_base_path() + "misc/" + chatbox + ".png"; + if (file_exists(misc_path)) + { + chatbox_path = misc_path; + } + else if (file_exists(legacy_path)) + chatbox_path = legacy_path; + else + { + QString hnngh_colonel = ao_app->get_theme_path("chatmed.png"); + chatbox_path = hnngh_colonel; + } ui_vp_chatbox->set_image_from_path(chatbox_path); } From 369cc298e408b33fe57c9d4ff72cb8a691f7550e Mon Sep 17 00:00:00 2001 From: sD Date: Sat, 7 Mar 2020 21:45:27 +0100 Subject: [PATCH 2/2] rename fallback chatbox --- src/courtroom.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/courtroom.cpp b/src/courtroom.cpp index 3d85c30..805c8cc 100644 --- a/src/courtroom.cpp +++ b/src/courtroom.cpp @@ -1667,8 +1667,8 @@ void Courtroom::handle_chatmessage_2() chatbox_path = legacy_path; else { - QString hnngh_colonel = ao_app->get_theme_path("chatmed.png"); - chatbox_path = hnngh_colonel; + QString default_chatbox_path = ao_app->get_theme_path("chatmed.png"); + chatbox_path = default_chatbox_path; } ui_vp_chatbox->set_image_from_path(chatbox_path); }