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

not really animated backgrounds

Browse Source
This commit is contained in:
stonedDiscord 2017-07-06 14:23:25 +02:00
parent b961ff3075
commit 4780ea5715
2 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
aoscene.cpp
View File

@ -14,16 +14,20 @@ AOScene::AOScene(QWidget *parent, AOApplication *p_ao_app) : QLabel(parent)
void AOScene::set_image(QString p_image) void AOScene::set_image(QString p_image)
{ {
QString background_path = ao_app->get_background_path() + p_image; QString background_path = ao_app->get_background_path() + p_image + ".png";
QString animated_background_path = ao_app->get_background_path() + p_image + ".gif";
QString default_path = ao_app->get_default_background_path() + p_image; QString default_path = ao_app->get_default_background_path() + p_image;
QPixmap background(background_path); QPixmap background(background_path);
QPixmap animated_background(animated_background_path);
QPixmap default_bg(default_path); QPixmap default_bg(default_path);
int w = this->width(); int w = this->width();
int h = this->height(); int h = this->height();
if (file_exists(background_path)) if (file_exists(animated_background_path))
this->setPixmap(animated_background.scaled(w, h));
else if (file_exists(background_path))
this->setPixmap(background.scaled(w, h)); this->setPixmap(background.scaled(w, h));
else else
this->setPixmap(default_bg.scaled(w, h)); this->setPixmap(default_bg.scaled(w, h));

32
courtroom.cpp
View File

@ -1348,48 +1348,48 @@ void Courtroom::set_scene()
show_testimony(); show_testimony();
//witness is default if pos is invalid //witness is default if pos is invalid
QString f_background = "witnessempty.png"; QString f_background = "witnessempty";
QString f_desk_image = "stand.png"; QString f_desk_image = "stand";
QString f_desk_mod = m_chatmessage[DESK_MOD]; QString f_desk_mod = m_chatmessage[DESK_MOD];
QString f_side = m_chatmessage[SIDE]; QString f_side = m_chatmessage[SIDE];
if (f_side == "def") if (f_side == "def")
{ {
f_background = "defenseempty.png"; f_background = "defenseempty";
if (is_ao2_bg) if (is_ao2_bg)
f_desk_image = "defensedesk.png"; f_desk_image = "defensedesk";
else else
f_desk_image = "bancodefensa.png"; f_desk_image = "bancodefensa";
} }
else if (f_side == "pro") else if (f_side == "pro")
{ {
f_background = "prosecutorempty.png"; f_background = "prosecutorempty";
if (is_ao2_bg) if (is_ao2_bg)
f_desk_image = "prosecutiondesk.png"; f_desk_image = "prosecutiondesk";
else else
f_desk_image = "bancoacusacion.png"; f_desk_image = "bancoacusacion";
} }
else if (f_side == "jud") else if (f_side == "jud")
{ {
f_background = "judgestand.png"; f_background = "judgestand";
f_desk_image = "judgedesk.png"; f_desk_image = "judgedesk";
} }
else if (f_side == "hld") else if (f_side == "hld")
{ {
f_background = "helperstand.png"; f_background = "helperstand";
f_desk_image = "helperdesk.png"; f_desk_image = "helperdesk";
} }
else if (f_side == "hlp") else if (f_side == "hlp")
{ {
f_background = "prohelperstand.png"; f_background = "prohelperstand";
f_desk_image = "prohelperdesk.png"; f_desk_image = "prohelperdesk";
} }
else else
{ {
if (is_ao2_bg) if (is_ao2_bg)
f_desk_image = "stand.png"; f_desk_image = "stand";
else else
f_desk_image = "estrado.png"; f_desk_image = "estrado";
} }
ui_vp_background->set_image(f_background); ui_vp_background->set_image(f_background);