Merge branch '2.8' into ic_fixes

AttorneyOnline · Aug 16, 2020 · 5c6dad8 · 5c6dad8
2 parents 507180d + a316933
commit 5c6dad8
Show file tree

Hide file tree

Showing 5 changed files with 488 additions and 418 deletions.
diff --git a/include/courtroom.h b/include/courtroom.h
@@ -109,7 +109,6 @@ class Courtroom : public QMainWindow {
       if (arup_locks.size() > place)
         arup_locks[place] = value;
     }
-    list_areas();
   }
 
   void character_loading_finished();
@@ -460,6 +459,14 @@ class Courtroom : public QMainWindow {
   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;