diff options
| -rw-r--r-- | Attorney_Online_remake.pro | 2 | ||||
| -rw-r--r-- | aoapplication.h | 2 | ||||
| -rw-r--r-- | courtroom.cpp | 17 |
3 files changed, 15 insertions, 6 deletions
diff --git a/Attorney_Online_remake.pro b/Attorney_Online_remake.pro index 0c9ed9d1..1c4cb9d3 100644 --- a/Attorney_Online_remake.pro +++ b/Attorney_Online_remake.pro @@ -13,7 +13,7 @@ RC_ICONS = logo.ico TARGET = Attorney_Online_remake TEMPLATE = app -VERSION = 2.3.1.0 +VERSION = 2.3.2.0 SOURCES += main.cpp\ lobby.cpp \ diff --git a/aoapplication.h b/aoapplication.h index b9eea6c5..9c39624f 100644 --- a/aoapplication.h +++ b/aoapplication.h @@ -135,7 +135,7 @@ public: private: const int RELEASE = 2; const int MAJOR_VERSION = 3; - const int MINOR_VERSION = 1; + const int MINOR_VERSION = 2; QString user_theme = "default"; diff --git a/courtroom.cpp b/courtroom.cpp index 2bd909b0..ee09bba9 100644 --- a/courtroom.cpp +++ b/courtroom.cpp @@ -764,7 +764,6 @@ void Courtroom::on_chat_return_pressed() QString f_side = ao_app->get_char_side(current_char); QString f_desk_mod = QString::number(ao_app->get_desk_mod(current_char, current_emote)); - qDebug() << "f_desk_mod: " << f_desk_mod; if (f_desk_mod == "-1") f_desk_mod = "chat"; @@ -1309,8 +1308,9 @@ void Courtroom::set_scene() } ui_vp_background->set_image(f_background); + qDebug() << "f_desk_image: " << f_desk_image; ui_vp_desk->set_image(f_desk_image); - ui_vp_legacy_desk->set_image(f_desk_image); + ui_vp_legacy_desk->set_legacy_desk(f_desk_image); if (f_desk_mod == "0" || (f_desk_mod != "1" && (f_side == "jud" || @@ -1329,8 +1329,17 @@ void Courtroom::set_scene() } else { - ui_vp_desk->hide(); - ui_vp_legacy_desk->show(); + qDebug() << "last"; + if (f_side == "wit") + { + ui_vp_desk->show(); + ui_vp_legacy_desk->hide(); + } + else + { + ui_vp_desk->hide(); + ui_vp_legacy_desk->show(); + } } } |