diff options
| author | Crystalwarrior <Varsash@Gmail.com> | 2022-07-30 03:45:42 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-29 19:45:42 -0500 |
| commit | f896475de414128fbc0f914224548e9dc5bd0cb3 (patch) | |
| tree | 679a5582853aa6072341699ddac3f9634075d040 /include | |
| parent | e36d79f7499ca4484585fad7738df4764f3fd0aa (diff) | |
Stop iniswapping from modifying the char.ini file (#712)
* Stop iniswapping from modifying the char.ini (which can potentially remove comments such as credits, charmaker notes, etc.)
* Fix iniswaps.ini and soundlist.ini not using vpath
* Deprecate get_char_name, making "name=" part in the char.ini no longer a thing
* Fix iniswap and emote dropdowns not getting properly updated when theme is reloaded
* Prevent reload theme from resetting your emote to the first one
* Fallback soundlist.ini
Co-authored-by: stonedDiscord <Tukz@gmx.de>
Co-authored-by: oldmud0 <oldmud0@users.noreply.github.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/aoapplication.h | 3 | ||||
| -rw-r--r-- | include/courtroom.h | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/include/aoapplication.h b/include/aoapplication.h index c69a0d31..3aa21a1f 100644 --- a/include/aoapplication.h +++ b/include/aoapplication.h @@ -435,9 +435,6 @@ public: // Returns whether the given pos is a judge position bool get_pos_is_judge(const QString &p_pos); - // Returns the name of p_char - QString get_char_name(QString p_char); - // Returns the total amount of emotes of p_char int get_emote_number(QString p_char); diff --git a/include/courtroom.h b/include/courtroom.h index 479b1051..d2d4107f 100644 --- a/include/courtroom.h +++ b/include/courtroom.h @@ -213,7 +213,8 @@ public: QString get_current_background() { return current_background; } // updates character to p_cid and updates necessary ui elements - void update_character(int p_cid); + // Optional "char_name" is the iniswap we're using + void update_character(int p_cid, QString char_name = "", bool reset_emote = false); // properly sets up some varibles: resets user state void enter_courtroom(); |