From f896475de414128fbc0f914224548e9dc5bd0cb3 Mon Sep 17 00:00:00 2001 From: Crystalwarrior Date: Sat, 30 Jul 2022 03:45:42 +0300 Subject: 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 Co-authored-by: oldmud0 --- include/aoapplication.h | 3 --- include/courtroom.h | 3 ++- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'include') 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(); -- cgit