diff options
| author | Cerapter <cerap@protonmail.com> | 2018-08-07 19:41:41 +0200 |
|---|---|---|
| committer | Cerapter <cerap@protonmail.com> | 2018-08-07 19:41:41 +0200 |
| commit | 78be99422ecec29c07f221d0fcb690af5d472fd1 (patch) | |
| tree | b469b09b20a567c033785d9430382e11d3ff4ab1 | |
| parent | f9baa0454d49d7da65a5c17afbb11aefa120e85a (diff) | |
CCCC version now displayed ingame.
| -rw-r--r-- | aoapplication.cpp | 8 | ||||
| -rw-r--r-- | aoapplication.h | 9 | ||||
| -rw-r--r-- | lobby.cpp | 2 |
3 files changed, 18 insertions, 1 deletions
diff --git a/aoapplication.cpp b/aoapplication.cpp index 12e540cd..6e95a522 100644 --- a/aoapplication.cpp +++ b/aoapplication.cpp @@ -94,6 +94,14 @@ QString AOApplication::get_version_string() QString::number(MINOR_VERSION); } +QString AOApplication::get_cccc_version_string() +{ + return + QString::number(CCCC_RELEASE) + "." + + QString::number(CCCC_MAJOR_VERSION) + "." + + QString::number(CCCC_MINOR_VERSION); +} + void AOApplication::reload_theme() { current_theme = read_theme(); diff --git a/aoapplication.h b/aoapplication.h index 33d18c79..9252cdd6 100644 --- a/aoapplication.h +++ b/aoapplication.h @@ -77,6 +77,11 @@ public: int get_minor_version() {return MINOR_VERSION;} QString get_version_string(); + int get_cccc_release() {return CCCC_RELEASE;} + int get_cccc_major_version() {return CCCC_MAJOR_VERSION;} + int get_cccc_minor_version() {return CCCC_MINOR_VERSION;} + QString get_cccc_version_string(); + /////////////////////////////////////////// void set_favorite_list(); @@ -229,6 +234,10 @@ private: const int MAJOR_VERSION = 4; const int MINOR_VERSION = 8; + const int CCCC_RELEASE = 1; + const int CCCC_MAJOR_VERSION = 3; + const int CCCC_MINOR_VERSION = 0; + QString current_theme = "default"; QVector<server_type> server_list; @@ -98,7 +98,7 @@ void Lobby::set_widgets() ui_connect->set_image("connect.png"); set_size_and_pos(ui_version, "version"); - ui_version->setText("Version: " + ao_app->get_version_string()); + ui_version->setText("AO Version: " + ao_app->get_version_string() + " | CCCC Version: " + ao_app->get_cccc_version_string()); set_size_and_pos(ui_about, "about"); ui_about->set_image("about.png"); |
