diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/aoapplication.h | 4 | ||||
| -rw-r--r-- | include/courtroom.h | 15 | ||||
| -rw-r--r-- | include/datatypes.h | 2 |
3 files changed, 15 insertions, 6 deletions
diff --git a/include/aoapplication.h b/include/aoapplication.h index 52b7673a..3b635410 100644 --- a/include/aoapplication.h +++ b/include/aoapplication.h @@ -107,8 +107,8 @@ public: ///////////////loading info/////////////////// - // player number, it's hardly used but might be needed for some old servers - int s_pv = 0; + // client ID. Not useful, to be removed eventually + int client_id = 0; QString server_software = ""; diff --git a/include/courtroom.h b/include/courtroom.h index d981bffd..e8c4e004 100644 --- a/include/courtroom.h +++ b/include/courtroom.h @@ -245,10 +245,11 @@ public: enum LogMode { IO_ONLY, DISPLAY_ONLY, - DISPLAY_AND_IO + DISPLAY_AND_IO, + QUEUED, }; // Log the message contents and information such as evidence presenting etc. into the log file, the IC log, or both. - void log_chatmessage(QString f_message, int f_char_id, QString f_showname = "", QString f_char = "", QString f_objection_mod = "", int f_evi_id = 0, int f_color = 0, LogMode f_log_mode=IO_ONLY); + void log_chatmessage(QString f_message, int f_char_id, QString f_showname = "", QString f_char = "", QString f_objection_mod = "", int f_evi_id = 0, int f_color = 0, LogMode f_log_mode=IO_ONLY, bool sender = false); // Log the message contents and information such as evidence presenting etc. into the IC logs void handle_callwords(); @@ -292,7 +293,12 @@ public: // 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, bool selfname = false, QDateTime timestamp = QDateTime::currentDateTime()); + int color = 0, bool selfname = false, QDateTime timestamp = QDateTime::currentDateTime(), + bool ghost = false); + + // clear sent messages that appear on the IC log but haven't been delivered + // yet to other players + void pop_ic_ghost(); // 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 @@ -485,6 +491,9 @@ private: // amount by which we multiply the delay when we parse punctuation chars const int punctuation_modifier = 3; + // amount of ghost blocks + int ghost_blocks = 0; + // Minumum and maximum number of parameters in the MS packet static const int MS_MINIMUM = 15; static const int MS_MAXIMUM = 30; diff --git a/include/datatypes.h b/include/datatypes.h index 3289bd86..d5d8551e 100644 --- a/include/datatypes.h +++ b/include/datatypes.h @@ -110,7 +110,7 @@ enum CHAT_MESSAGE { FRAME_REALIZATION, FRAME_SFX, ADDITIVE, - EFFECTS + EFFECTS, }; enum EMOTE_MOD { |