Mamanyonyo/atrooney-online-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed the tiny desk issue, ready for 2.3.2

Browse Source
This commit is contained in:
OmniTroid 2017-03-29 22:28:25 +02:00
parent 244339645d
commit 8c34754fb8
3 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Attorney_Online_remake.pro
View File

@ -13,7 +13,7 @@ RC_ICONS = logo.ico
TARGET = Attorney_Online_remake TARGET = Attorney_Online_remake
TEMPLATE = app TEMPLATE = app
VERSION = 2.3.1.0 VERSION = 2.3.2.0
SOURCES += main.cpp\ SOURCES += main.cpp\
lobby.cpp \ lobby.cpp \

2
aoapplication.h
View File

@ -135,7 +135,7 @@ public:
private: private:
const int RELEASE = 2; const int RELEASE = 2;
const int MAJOR_VERSION = 3; const int MAJOR_VERSION = 3;
const int MINOR_VERSION = 1; const int MINOR_VERSION = 2;
QString user_theme = "default"; QString user_theme = "default";

13
courtroom.cpp
View File

@ -764,7 +764,6 @@ void Courtroom::on_chat_return_pressed()
QString f_side = ao_app->get_char_side(current_char); 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)); 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") if (f_desk_mod == "-1")
f_desk_mod = "chat"; f_desk_mod = "chat";
@ -1309,8 +1308,9 @@ void Courtroom::set_scene()
} }
ui_vp_background->set_image(f_background); ui_vp_background->set_image(f_background);
qDebug() << "f_desk_image: " << f_desk_image;
ui_vp_desk->set_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" && if (f_desk_mod == "0" || (f_desk_mod != "1" &&
(f_side == "jud" || (f_side == "jud" ||
@ -1328,11 +1328,20 @@ void Courtroom::set_scene()
ui_vp_desk->show(); ui_vp_desk->show();
} }
else else
{
qDebug() << "last";
if (f_side == "wit")
{
ui_vp_desk->show();
ui_vp_legacy_desk->hide();
}
else
{ {
ui_vp_desk->hide(); ui_vp_desk->hide();
ui_vp_legacy_desk->show(); ui_vp_legacy_desk->show();
} }
} }
}
void Courtroom::set_text_color() void Courtroom::set_text_color()
{ {