diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/aoapplication.h | 12 | ||||
| -rw-r--r-- | include/courtroom.h | 3 | ||||
| -rw-r--r-- | include/datatypes.h | 1 |
3 files changed, 11 insertions, 5 deletions
diff --git a/include/aoapplication.h b/include/aoapplication.h index 72c3457d..43ed559e 100644 --- a/include/aoapplication.h +++ b/include/aoapplication.h @@ -100,11 +100,12 @@ public: bool casing_alerts_supported = false; bool modcall_reason_supported = false; bool looping_sfx_supported = false; - bool additive_text_supported = false; + bool additive_supported = false; bool effects_supported = false; bool y_offset_supported = false; bool expanded_desk_mods_supported = false; bool auth_packet_supported = false; + bool custom_blips_supported = false; ///////////////loading info/////////////////// @@ -260,7 +261,7 @@ public: QString get_char_side(QString p_char); // Returns the showname from the ini of p_char - QString get_showname(QString p_char); + QString get_showname(QString p_char, int p_emote = -1); // Returns the category of this character QString get_category(QString p_char); @@ -336,8 +337,11 @@ public: // Returns the desk modifier for p_char's p_emote int get_desk_mod(QString p_char, int p_emote); - // Returns p_char's blips (previously called their "gender") - QString get_blips(QString p_char); + // Returns p_char's blipname by reading char.ini for blips (previously called "gender") + QString get_blipname(QString p_char, int p_emote = -1); + + // Returns p_blipname's sound(path) to play in the client + QString get_blips(QString p_blipname); // Get a property of a given emote, or get it from "options" if emote doesn't have it QString get_emote_property(QString p_char, QString p_emote, QString p_property); diff --git a/include/courtroom.h b/include/courtroom.h index 0b26247f..20956d99 100644 --- a/include/courtroom.h +++ b/include/courtroom.h @@ -496,7 +496,7 @@ private: // Minumum and maximum number of parameters in the MS packet static const int MS_MINIMUM = 15; - static const int MS_MAXIMUM = 30; + static const int MS_MAXIMUM = 31; QString m_chatmessage[MS_MAXIMUM]; QString previous_ic_message = ""; @@ -692,6 +692,7 @@ private: QLineEdit *ui_ic_chat_message; AOLineEditFilter *ui_ic_chat_message_filter; QLineEdit *ui_ic_chat_name; + QLineEdit *ui_custom_blips; QLineEdit *ui_ooc_chat_message; QLineEdit *ui_ooc_chat_name; diff --git a/include/datatypes.h b/include/datatypes.h index 3a82efff..32bff59e 100644 --- a/include/datatypes.h +++ b/include/datatypes.h @@ -111,6 +111,7 @@ enum CHAT_MESSAGE { FRAME_SFX, ADDITIVE, EFFECTS, + BLIPNAME, }; enum EMOTE_MOD_TYPE { |