diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/aoapplication.h | 4 | ||||
| -rw-r--r-- | include/chatlogpiece.h | 20 | ||||
| -rw-r--r-- | include/courtroom.h | 5 | ||||
| -rw-r--r-- | include/datatypes.h | 7 | ||||
| -rw-r--r-- | include/demoserver.h | 1 | ||||
| -rw-r--r-- | include/networkmanager.h | 2 |
6 files changed, 25 insertions, 14 deletions
diff --git a/include/aoapplication.h b/include/aoapplication.h index c094a33..ecd3180 100644 --- a/include/aoapplication.h +++ b/include/aoapplication.h @@ -553,8 +553,8 @@ public: private: const int RELEASE = 2; - const int MAJOR_VERSION = 9; - const int MINOR_VERSION = 1; + const int MAJOR_VERSION = 10; + const int MINOR_VERSION = 0; QVector<server_type> server_list; QVector<server_type> favorite_list; diff --git a/include/chatlogpiece.h b/include/chatlogpiece.h index da78d0d..df6ccd0 100644 --- a/include/chatlogpiece.h +++ b/include/chatlogpiece.h @@ -10,17 +10,18 @@ class chatlogpiece { public: chatlogpiece(); chatlogpiece(QString p_name, QString p_showname, QString p_message, - QString p_action,int color); + QString p_action,int color, bool selfname); chatlogpiece(QString p_name, QString p_showname, QString p_message, - QString p_action, int color, QDateTime p_datetime); + QString p_action, int color, bool selfname, QDateTime p_datetime); - QString get_name(); - QString get_showname(); - QString get_message(); - QString get_action(); - QDateTime get_datetime(); - QString get_datetime_as_string(); - int get_chat_color(); + QString get_name() { return name; }; + QString get_showname() { return showname; }; + QString get_message() { return message; }; + QString get_action() { return action; }; + bool get_selfname() const { return selfname; }; + QDateTime get_datetime() { return datetime; }; + QString get_datetime_as_string() { return datetime.toString(); }; + int get_chat_color() const { return color; }; QString get_full(); private: @@ -28,6 +29,7 @@ private: QString showname; QString message; QString action; + bool selfname; QDateTime datetime; int color; }; diff --git a/include/courtroom.h b/include/courtroom.h index 3b56c77..bf688b5 100644 --- a/include/courtroom.h +++ b/include/courtroom.h @@ -73,6 +73,7 @@ public: void append_evidence(evi_type p_evi) { evidence_list.append(p_evi); } void append_music(QString f_music) { music_list.append(f_music); } void append_area(QString f_area) { area_list.append(f_area); } + void clear_chars() { char_list.clear(); } void clear_music() { music_list.clear(); } void clear_areas() { area_list.clear(); } @@ -278,14 +279,14 @@ public: int default_color = 0); void log_ic_text(QString p_name, QString p_showname, QString p_message, - QString p_action = "", int p_color = 0); + QString p_action = "", int p_color = 0, bool p_selfname = false); // adds text to the IC chatlog. p_name first as bold then p_text then a newlin // this function keeps the chatlog scrolled to the top unless there's text // selected // or the user isn't already scrolled to the top void append_ic_text(QString p_text, QString p_name = "", QString action = "", - int color = 0, QDateTime timestamp = QDateTime::currentDateTime()); + int color = 0, bool selfname = false, QDateTime timestamp = QDateTime::currentDateTime()); // prints who played the song to IC chat and plays said song(if found on local // filesystem) takes in a list where the first element is the song name and diff --git a/include/datatypes.h b/include/datatypes.h index ebf2e38..2f03d39 100644 --- a/include/datatypes.h +++ b/include/datatypes.h @@ -101,6 +101,13 @@ enum CHAT_MESSAGE { EFFECTS }; +enum EMOTE_MOD { + IDLE = 0, + PREANIM = 1, + ZOOM = 5, + PREANIM_ZOOM = 6, +}; + enum MUSIC_EFFECT { FADE_IN = 1, FADE_OUT = 2, SYNC_POS = 4 }; #endif // DATATYPES_H diff --git a/include/demoserver.h b/include/demoserver.h index cadc52d..d355ddb 100644 --- a/include/demoserver.h +++ b/include/demoserver.h @@ -31,6 +31,7 @@ private: QTcpSocket* client_sock = nullptr; bool client_connected = false; bool partial_packet = false; + bool debug_mode = false; QString temp_packet = ""; QQueue<QString> demo_data; QString sc_packet; diff --git a/include/networkmanager.h b/include/networkmanager.h index 1e1a60b..26a61f2 100644 --- a/include/networkmanager.h +++ b/include/networkmanager.h @@ -33,7 +33,7 @@ public: const QString DEFAULT_MS_BASEURL = "https://servers.aceattorneyonline.com"; QString ms_baseurl = DEFAULT_MS_BASEURL; - const int heartbeat_interval = 60 * 5; + const int heartbeat_interval = 60 * 5 * 1000; bool partial_packet = false; QString temp_packet = ""; |
