diff options
| author | scatterflower <2956568+scatterflower@users.noreply.github.com> | 2020-08-16 07:26:55 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-16 07:26:55 -0500 |
| commit | de6a2ba4ae49bc6551265ec097b46f2ab9565e17 (patch) | |
| tree | e9b27495401a2e700706670fb94b7690870b3518 | |
| parent | 34604742f15c35c96ca618300cc2861d7782f528 (diff) | |
| parent | cd3ddfe16c423fede1164aa95a36b65caab100e4 (diff) | |
Merge pull request #244 from scatterflower/is241
Optimize ARUP
| -rw-r--r-- | include/courtroom.h | 9 | ||||
| -rw-r--r-- | src/courtroom.cpp | 17 | ||||
| -rw-r--r-- | src/packet_distribution.cpp | 1 |
3 files changed, 17 insertions, 10 deletions
diff --git a/include/courtroom.h b/include/courtroom.h index 182c2a68..f1cb0265 100644 --- a/include/courtroom.h +++ b/include/courtroom.h @@ -109,7 +109,6 @@ public: if (arup_locks.size() > place) arup_locks[place] = value; } - list_areas(); } void character_loading_finished(); @@ -458,6 +457,14 @@ private: QString current_background = "default"; QString current_side = ""; + QBrush free_brush; + QBrush lfp_brush; + QBrush casing_brush; + QBrush recess_brush; + QBrush rp_brush; + QBrush gaming_brush; + QBrush locked_brush; + AOMusicPlayer *music_player; AOSfxPlayer *sfx_player; AOSfxPlayer *objection_player; diff --git a/src/courtroom.cpp b/src/courtroom.cpp index a0c7e2c1..a09ea569 100644 --- a/src/courtroom.cpp +++ b/src/courtroom.cpp @@ -935,6 +935,14 @@ void Courtroom::set_widgets() ui_spectator->setToolTip(tr("Become a spectator. You won't be able to " "interact with the in-character screen.")); + free_brush = *new QBrush(ao_app->get_color("area_free_color", "courtroom_design.ini")); + lfp_brush = *new QBrush(ao_app->get_color("area_lfp_color", "courtroom_design.ini")); + casing_brush = *new QBrush(ao_app->get_color("area_casing_color", "courtroom_design.ini")); + recess_brush = *new QBrush(ao_app->get_color("area_recess_color", "courtroom_design.ini")); + rp_brush = *new QBrush(ao_app->get_color("area_rp_color", "courtroom_design.ini")); + gaming_brush = *new QBrush(ao_app->get_color("area_gaming_color", "courtroom_design.ini")); + locked_brush = *new QBrush(ao_app->get_color("area_locked_color", "courtroom_design.ini")); + refresh_evidence(); } @@ -1436,15 +1444,6 @@ void Courtroom::list_areas() ui_area_list->clear(); // ui_music_search->setText(""); - QString f_file = "courtroom_design.ini"; - - QBrush free_brush(ao_app->get_color("area_free_color", f_file)); - QBrush lfp_brush(ao_app->get_color("area_lfp_color", f_file)); - QBrush casing_brush(ao_app->get_color("area_casing_color", f_file)); - QBrush recess_brush(ao_app->get_color("area_recess_color", f_file)); - QBrush rp_brush(ao_app->get_color("area_rp_color", f_file)); - QBrush gaming_brush(ao_app->get_color("area_gaming_color", f_file)); - QBrush locked_brush(ao_app->get_color("area_locked_color", f_file)); int n_listed_areas = 0; diff --git a/src/packet_distribution.cpp b/src/packet_distribution.cpp index b543cfb5..fd7453ee 100644 --- a/src/packet_distribution.cpp +++ b/src/packet_distribution.cpp @@ -676,6 +676,7 @@ void AOApplication::server_packet_received(AOPacket *p_packet) w_courtroom->arup_modify(arup_type, n_element - 1, f_contents.at(n_element)); } + w_courtroom->list_areas(); } } else if (header == "IL") { |