aboutsummaryrefslogtreecommitdiff
path: root/include/aoapplication.h
diff options
context:
space:
mode:
authorin1tiate <32779090+in1tiate@users.noreply.github.com>2024-05-14 11:02:32 -0500
committerGitHub <noreply@github.com>2024-05-14 18:02:32 +0200
commitc9eabf35dafa22f7ad7f012c23f63f1605a47668 (patch)
treed64919dae244228a136a445cc64510f24ba7dfe4 /include/aoapplication.h
parent951766666621fa77e257e6b5616fe4ab1eb2a52f (diff)
Add [Options] override for blips and shownames for parity with 2.5 (#953)
* split get_blips into two functions Because otherwise it would always return only what was read from char.ini, and we want it to be able to read our custom QLineEdit too, right? * include new function, rewrite description * check for custom blips support in packet * add custom blips enabled bool * increase MS_MAXIMUM, add custom blips QLineEdit * add BLIPNAME to chat message * introducing custom blips * introducing custom blips I said * unfold if * unfold other if * retool custom blips code, add ini parser * remove extraneous debug calls * fix incorrect default value on get_showname * restructure ini format * fix parser again --------- Co-authored-by: Lernos <lernoskey@gmail.com> Co-authored-by: stonedDiscord <Tukz@gmx.de>
Diffstat (limited to 'include/aoapplication.h')
-rw-r--r--include/aoapplication.h12
1 files changed, 8 insertions, 4 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);