From a6b39c1d4f0ee0c9d6ffae14de20188d1dedb2ea Mon Sep 17 00:00:00 2001 From: David Skoland Date: Tue, 24 Jan 2017 14:30:18 +0100 Subject: added hdid implementation for linux and did more work on courtroom --- aoapplication.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'aoapplication.h') diff --git a/aoapplication.h b/aoapplication.h index 77d7af0..3dfd813 100644 --- a/aoapplication.h +++ b/aoapplication.h @@ -64,14 +64,14 @@ public: void set_user_theme(); QString get_user_theme() {return user_theme;} - //path functions + //implementation in path_functions.cpp QString get_base_path(); QString get_theme_path(); QString get_default_theme_path(); QString get_character_path(QString p_character); QString get_demothings_path(); - //text file functions + //implementation in text_file_functions.cpp QString read_user_theme(); void write_to_serverlist_txt(QString p_line); QVector read_serverlist_txt(); -- cgit From b606b55cae1c1244ec9de19c54acf1a1824013f4 Mon Sep 17 00:00:00 2001 From: David Skoland Date: Tue, 24 Jan 2017 21:00:56 +0100 Subject: started implementing legacy loading protocol --- aoapplication.h | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'aoapplication.h') diff --git a/aoapplication.h b/aoapplication.h index 3dfd813..3c6ef4c 100644 --- a/aoapplication.h +++ b/aoapplication.h @@ -44,10 +44,18 @@ public: unsigned int s_decryptor = 5; bool encryption_needed = true; bool ao2_features = false; - //player number, it's hardly used but might be needed for some old servers - bool s_pv = 0; - ////////////////////////////////////////////////// + ///////////////loading info/////////////////// + + //player number, it's hardly used but might be needed for some old servers + int s_pv = 0; + + int char_list_size = 0; + int loaded_chars = 0; + int evidence_list_size = 0; + int loaded_evidence = 0; + int music_list_size = 0; + int loaded_music = 0; int get_release() {return RELEASE;} int get_major_version() {return MAJOR_VERSION;} -- cgit From 58d98e41bea77dac1b5726b4ead8b3f072750b38 Mon Sep 17 00:00:00 2001 From: David Skoland Date: Wed, 25 Jan 2017 18:09:55 +0100 Subject: started making the loading screen --- aoapplication.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'aoapplication.h') diff --git a/aoapplication.h b/aoapplication.h index 3c6ef4c..c9daf86 100644 --- a/aoapplication.h +++ b/aoapplication.h @@ -57,6 +57,8 @@ public: int music_list_size = 0; int loaded_music = 0; + //////////////////versioning/////////////// + int get_release() {return RELEASE;} int get_major_version() {return MAJOR_VERSION;} int get_minor_version() {return MINOR_VERSION;} -- cgit From 99aa327318ab00f2049cfcefadd353c3a4e06bf7 Mon Sep 17 00:00:00 2001 From: David Skoland Date: Wed, 25 Jan 2017 19:50:49 +0100 Subject: loading characters now works with overlay --- aoapplication.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'aoapplication.h') diff --git a/aoapplication.h b/aoapplication.h index c9daf86..a63ec41 100644 --- a/aoapplication.h +++ b/aoapplication.h @@ -96,6 +96,9 @@ private: QVector server_list; QVector favorite_list; + +public slots: + void loading_cancelled(); }; #endif // AOAPPLICATION_H -- cgit From 9682087667e2de26e14406efde960b8c7f0c3c98 Mon Sep 17 00:00:00 2001 From: David Skoland Date: Fri, 27 Jan 2017 01:17:33 +0100 Subject: implemented ooc chat and cleaned up some old headers --- aoapplication.h | 1 + 1 file changed, 1 insertion(+) (limited to 'aoapplication.h') diff --git a/aoapplication.h b/aoapplication.h index a63ec41..5cd255c 100644 --- a/aoapplication.h +++ b/aoapplication.h @@ -86,6 +86,7 @@ public: void write_to_serverlist_txt(QString p_line); QVector read_serverlist_txt(); pos_size_type get_pos_and_size(QString p_identifier, QString p_design_path); + QString get_char_side(QString p_char); private: const int RELEASE = 2; -- cgit