Overlays folder

include/aolayer.h

@@ -178,7 +178,7 @@ class BackgroundLayer : public AOLayer {
   Q_OBJECT
 public:
   BackgroundLayer(QWidget *p_parent, AOApplication *p_ao_app);
-  void load_image(QString p_filename);
+  void load_image(QString p_filename, bool desk = false);
 signals:
   void hide_void();
 protected:

src/aolayer.cpp

@@ -144,7 +144,7 @@ void AOLayer::move_and_center(int ax, int ay)
     center_pixmap(movie_frames[0]); // just use the first frame since dimensions are all that matter
 }
 
-void BackgroundLayer::load_image(QString p_filename)
+void BackgroundLayer::load_image(QString p_filename, bool desk)
 {
   play_once = false;
   cull_image = false;
@@ -155,7 +155,18 @@ void BackgroundLayer::load_image(QString p_filename)
 #ifdef DEBUG_MOVIE
   qDebug() << "[BackgroundLayer] BG loaded: " << p_filename;
 #endif
-  QString final_path = ao_app->get_image_suffix(ao_app->get_background_path(p_filename));
+  QString final_path = "";
+  if (!desk) {
+    final_path = ao_app->get_image_suffix(ao_app->get_background_path(p_filename));
+  }
+  else {
+    if (file_exists(ao_app->get_image_suffix(ao_app->get_background_path(p_filename)))) {
+      final_path = ao_app->get_image_suffix(ao_app->get_background_path(p_filename));
+    }
+    else {
+      final_path = ao_app->get_image_suffix(VPath("overlays/" + p_filename));
+    }
+  }
 
   if (final_path == last_path) {
     // Don't restart background if background is unchanged

src/courtroom.cpp

@@ -4509,7 +4509,7 @@ void Courtroom::set_scene(bool show_desk, const QString f_side)
 {
   current_side = f_side;
   ui_vp_background->load_image(ao_app->get_pos_path(f_side));
-  ui_vp_desk->load_image(ao_app->get_pos_path(f_side, true));
+  ui_vp_desk->load_image(ao_app->get_pos_path(f_side, true), true);
 
   if (show_desk)
     ui_vp_desk->show();

src/path_functions.cpp

@@ -140,13 +140,17 @@ QString AOApplication::get_pos_path(const QString& pos, const bool desk)
   QString desk_override = read_design_ini("overlays/" + f_background, get_background_path("design.ini"));
   if (desk_override != "") {
     f_desk_image = desk_override;
-} else if (w_courtroom->server_overlay != "") { // BN+ Packet
+  }
+  else if (w_courtroom->server_overlay != "") { // BN+ Packet
     if (file_exists(get_image_suffix(
-            get_background_path(w_courtroom->server_overlay))))
-    {
+            get_background_path(w_courtroom->server_overlay)))) {
       f_desk_image = w_courtroom->server_overlay;
     }
-}
+    else if (file_exists(get_image_suffix(
+                 VPath("overlays/" + w_courtroom->server_overlay)))) {
+      f_desk_image = w_courtroom->server_overlay;
+    }
+  }
   if (desk) {
     return f_desk_image;
   }