Merge remote-tracking branch 'upstream/master'
@ -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
|
||||
|
Before Width: | Height: | Size: 175 B After Width: | Height: | Size: 200 B |
Before Width: | Height: | Size: 182 B After Width: | Height: | Size: 237 B |
Before Width: | Height: | Size: 181 B After Width: | Height: | Size: 241 B |
Before Width: | Height: | Size: 182 B After Width: | Height: | Size: 230 B |
Before Width: | Height: | Size: 183 B After Width: | Height: | Size: 243 B |
Before Width: | Height: | Size: 183 B After Width: | Height: | Size: 241 B |
Before Width: | Height: | Size: 184 B After Width: | Height: | Size: 241 B |
Before Width: | Height: | Size: 183 B After Width: | Height: | Size: 242 B |
Before Width: | Height: | Size: 185 B After Width: | Height: | Size: 240 B |
Before Width: | Height: | Size: 186 B After Width: | Height: | Size: 237 B |
@ -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";
|
||||
|
||||
|
@ -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")
|
||||
{
|
||||
|
@ -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";
|
||||
}
|
||||
|