Merge remote-tracking branch 'upstream/master'

14 files changed, 8 insertions, 8 deletions

diff --git a/base/themes/default/courtroom_design.ini b/base/themes/default/courtroom_design.ini
index 27e69683..960d6e4c 100644
--- a/base/themes/default/courtroom_design.ini
+++ b/base/themes/default/courtroom_design.ini
@@ -113,12 +113,12 @@ pre_no_interrupt = 200, 490, 80, 21
 
 ; Penalty bars and judge's buttons for penalizing. Other than the bars, these
 ; ONLY show up on a character with /pos jud
-defense_bar = 15, 566, 170, 9
-prosecution_bar = 15, 582, 170, 9
+defense_bar = 5, 566, 187, 9
+prosecution_bar = 5, 582, 187, 9
 defense_plus = 183, 566, 9, 9
-defense_minus = 6, 566, 9, 9
+defense_minus = 5, 566, 9, 9
 prosecution_plus = 183, 582, 9, 9
-prosecution_minus = 6, 582, 9, 9
+prosecution_minus = 5, 582, 9, 9
 
 ; Judge's buttons for WT and CE. /pos jud
 witness_testimony = 290, 470, 85, 42
diff --git a/base/themes/default/prosecutionbar0.png b/base/themes/default/prosecutionbar0.png
index 040d671d..56b8d61c 100644
--- a/base/themes/default/prosecutionbar0.png
+++ b/base/themes/default/prosecutionbar0.png
diff --git a/base/themes/default/prosecutionbar1.png b/base/themes/default/prosecutionbar1.png
index cb9af2d4..b44323c9 100644
--- a/base/themes/default/prosecutionbar1.png
+++ b/base/themes/default/prosecutionbar1.png
diff --git a/base/themes/default/prosecutionbar2.png b/base/themes/default/prosecutionbar2.png
index 08ef12b1..8bb51da5 100644
--- a/base/themes/default/prosecutionbar2.png
+++ b/base/themes/default/prosecutionbar2.png
diff --git a/base/themes/default/prosecutionbar3.png b/base/themes/default/prosecutionbar3.png
index 278d3e4c..d0b9c4c2 100644
--- a/base/themes/default/prosecutionbar3.png
+++ b/base/themes/default/prosecutionbar3.png
diff --git a/base/themes/default/prosecutionbar4.png b/base/themes/default/prosecutionbar4.png
index 64f2e9d4..b4ac6bb0 100644
--- a/base/themes/default/prosecutionbar4.png
+++ b/base/themes/default/prosecutionbar4.png
diff --git a/base/themes/default/prosecutionbar5.png b/base/themes/default/prosecutionbar5.png
index 5cf62a44..6bb5eb56 100644
--- a/base/themes/default/prosecutionbar5.png
+++ b/base/themes/default/prosecutionbar5.png
diff --git a/base/themes/default/prosecutionbar6.png b/base/themes/default/prosecutionbar6.png
index c87b86f2..9ee9638f 100644
--- a/base/themes/default/prosecutionbar6.png
+++ b/base/themes/default/prosecutionbar6.png
diff --git a/base/themes/default/prosecutionbar7.png b/base/themes/default/prosecutionbar7.png
index f31fcc1d..34e00da9 100644
--- a/base/themes/default/prosecutionbar7.png
+++ b/base/themes/default/prosecutionbar7.png
diff --git a/base/themes/default/prosecutionbar8.png b/base/themes/default/prosecutionbar8.png
index a2a89354..5035b51e 100644
--- a/base/themes/default/prosecutionbar8.png
+++ b/base/themes/default/prosecutionbar8.png
diff --git a/base/themes/default/prosecutionbar9.png b/base/themes/default/prosecutionbar9.png
index d272ca38..b185a1a4 100644
--- a/base/themes/default/prosecutionbar9.png
+++ b/base/themes/default/prosecutionbar9.png
diff --git a/include/aoapplication.h b/include/aoapplication.h
index f4207333..44aef7a8 100644
--- a/include/aoapplication.h
+++ b/include/aoapplication.h
@@ -300,7 +300,7 @@ public:
 private:
   const int RELEASE = 2;
   const int MAJOR_VERSION = 6;
-  const int MINOR_VERSION = 0;
+  const int MINOR_VERSION = 1;
 
   QString current_theme = "default";
 
diff --git a/src/packet_distribution.cpp b/src/packet_distribution.cpp
index 954062e8..68d2fb9b 100644
--- a/src/packet_distribution.cpp
+++ b/src/packet_distribution.cpp
@@ -651,7 +651,7 @@ void AOApplication::server_packet_received(AOPacket *p_packet)
   }
   else if (header == "BD")
   {
-    call_notice("You are banned on this server.");
+    call_notice("You are banned on this server.\nReason: " + f_contents.at(0));
   }
   else if (header == "ZZ")
   {
diff --git a/src/text_file_functions.cpp b/src/text_file_functions.cpp
index f35690af..1e920d73 100644
--- a/src/text_file_functions.cpp
+++ b/src/text_file_functions.cpp
@@ -373,10 +373,10 @@ QString AOApplication::get_sfx_suffix(QString sound_to_check)
 
 QString AOApplication::get_image_suffix(QString path_to_check)
 {
-    QString apng_check = get_sounds_path(path_to_check + ".apng");
+    QString apng_check = path_to_check + ".apng";
     if (file_exists(apng_check))
     {
-        return path_to_check + ".apng";
+        return apng_check;
     }
     return path_to_check + ".gif";
 }