diff options
| author | stonedDiscord <stoned@derpymail.org> | 2017-01-28 14:49:58 +0100 |
|---|---|---|
| committer | stonedDiscord <stoned@derpymail.org> | 2017-01-28 14:49:58 +0100 |
| commit | d73ab6a589d2f2ad151f03c0ba6f49fa2ca36d01 (patch) | |
| tree | b6749e2c9140545254e61a132c74d0c337553bad /lobby.h | |
| parent | d4ad200b612acb1ed2a74d057efc8c3cbfa07ad2 (diff) | |
| parent | ab321a4a7af042eed2b9cb7c82fe8345a9d7b594 (diff) | |
Merge remote-tracking branch 'refs/remotes/OmniTroid/master'
Diffstat (limited to 'lobby.h')
| -rw-r--r-- | lobby.h | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -30,6 +30,9 @@ public: void show_loading_overlay(){ui_loading_background->show();} void hide_loading_overlay(){ui_loading_background->hide();} QString get_chatlog(); + int get_selected_server(); + + bool public_servers_selected = true; ~Lobby(); @@ -39,8 +42,6 @@ private: const int m_lobby_width = 517; const int m_lobby_height = 666; - bool public_servers_selected = true; - AOImage *ui_background; AOButton *ui_public_servers; |
