fixed some copypasta overlooks and removed redundant member in lobby.h
This commit is contained in:
parent
5ddde2bf9c
commit
63caae75ea
@ -70,7 +70,7 @@ HEADERS += lobby.h \
|
||||
aoblipplayer.h \
|
||||
aoevidencebutton.h
|
||||
|
||||
unix:LIBS += -L/home/omnitroid/Project/Attorney_Online_2/src -lbass
|
||||
unix:LIBS += -L$$PWD -lbass
|
||||
win32:LIBS += "$$PWD/bass.dll"
|
||||
android:LIBS += -L$$PWD\android\libs\armeabi-v7a\ -lbass
|
||||
|
||||
|
10
lobby.cpp
10
lobby.cpp
@ -13,7 +13,6 @@ Lobby::Lobby(AOApplication *p_ao_app) : QMainWindow()
|
||||
ao_app = p_ao_app;
|
||||
|
||||
this->setWindowTitle("Attorney Online 2");
|
||||
this->setFixedSize(m_lobby_width, m_lobby_height);
|
||||
|
||||
ui_background = new AOImage(this, ao_app);
|
||||
ui_public_servers = new AOButton(this, ao_app);
|
||||
@ -65,16 +64,13 @@ void Lobby::set_widgets()
|
||||
|
||||
if (f_lobby.width < 0 || f_lobby.height < 0)
|
||||
{
|
||||
qDebug() << "W: did not find courtroom width or height in " << filename;
|
||||
qDebug() << "W: did not find lobby width or height in " << filename;
|
||||
|
||||
this->resize(517, 666);
|
||||
}
|
||||
else
|
||||
{
|
||||
m_lobby_width = f_lobby.width;
|
||||
m_lobby_height = f_lobby.height;
|
||||
|
||||
this->setFixedSize(f_lobby.width, f_lobby.height);
|
||||
this->resize(f_lobby.width, f_lobby.height);
|
||||
}
|
||||
|
||||
set_size_and_pos(ui_background, "lobby");
|
||||
@ -128,7 +124,7 @@ void Lobby::set_widgets()
|
||||
ui_chatmessage->setStyleSheet("background-color: rgba(0, 0, 0, 0);"
|
||||
"selection-background-color: rgba(0, 0, 0, 0);");
|
||||
|
||||
ui_loading_background->resize(m_lobby_width, m_lobby_height);
|
||||
ui_loading_background->resize(this->width(), this->height());
|
||||
ui_loading_background->set_image("loadingbackground.png");
|
||||
|
||||
|
||||
|
3
lobby.h
3
lobby.h
@ -42,9 +42,6 @@ public:
|
||||
private:
|
||||
AOApplication *ao_app;
|
||||
|
||||
int m_lobby_width = 517;
|
||||
int m_lobby_height = 666;
|
||||
|
||||
AOImage *ui_background;
|
||||
|
||||
AOButton *ui_public_servers;
|
||||
|
@ -9,6 +9,8 @@ QString AOApplication::get_base_path()
|
||||
|
||||
#ifdef OMNI_DEBUG
|
||||
return "/media/omnitroid/Data/winshare/AO/client/base/";
|
||||
#elif OMNI_DEBUG2
|
||||
return "/home/omnitroid/winshare/AO/client/base/";
|
||||
#elif defined(OMNI_WIN_DEBUG)
|
||||
return "E:/AO/client/base/";
|
||||
#elif defined(OMNI_WIN_DEBUG2)
|
||||
|
Loading…
Reference in New Issue
Block a user