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

Merge pull request #244 from scatterflower/is241

Browse Source 
Optimize ARUP
This commit is contained in:
scatterflower 2020-08-16 07:26:55 -05:00 committed by GitHub
commit de6a2ba4ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/courtroom.h
View File

@ -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;

17
src/courtroom.cpp
View File

@ -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;

1
src/packet_distribution.cpp
View File

@ -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") {