aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCrystalwarrior <Varsash@Gmail.com>2020-06-29 18:39:27 +0300
committerGitHub <noreply@github.com>2020-06-29 10:39:27 -0500
commit19d0c29b35cafc3d12209aa29fa4db5c8dbe930b (patch)
tree25f43569aeeac029bc646ed64a62d13588cebc38
parent12023c4d5c5c57ae4e06a75d1a94f7b03a88fc28 (diff)
Fix issues when undefined colors result in everyone's chat not using talk anims (#174)
base/misc/default/config.ini with properly defined "baseline" colors will have to be supplied with vanilla content later. Remove hardcoded colors - user has no access to these unless config.ini is valid, yet when others speak using these ID's their text shows up just fine. Either reimplement full on hardcoding madness (NOOOOOOOOOOOOOOOOOOOOOOOO NO NO NO NOOOOOOOOOOOOOOOO NOOOOO!!!!) or yeet. I chose the sensible option :^)
-rw-r--r--src/courtroom.cpp2
-rw-r--r--src/text_file_functions.cpp32
2 files changed, 1 insertions, 33 deletions
diff --git a/src/courtroom.cpp b/src/courtroom.cpp
index e3eeb599..5080b1d6 100644
--- a/src/courtroom.cpp
+++ b/src/courtroom.cpp
@@ -4245,7 +4245,7 @@ void Courtroom::set_text_color_dropdown()
current_char) == "1");
color_markdown_talking_list.append(
ao_app->get_chat_markdown("c" + QString::number(c) + "_talking",
- current_char) == "1");
+ current_char) != "0");
QString color_name = ao_app->get_chat_markdown(
"c" + QString::number(c) + "_name", current_char);
diff --git a/src/text_file_functions.cpp b/src/text_file_functions.cpp
index 1689cd3f..4ea58d6b 100644
--- a/src/text_file_functions.cpp
+++ b/src/text_file_functions.cpp
@@ -449,38 +449,6 @@ QColor AOApplication::get_chat_color(QString p_identifier, QString p_chat)
{
QColor return_color(255, 255, 255);
- switch (p_identifier.toInt()) {
- case 0: // White
- return_color = QColor(255, 255, 255);
- break;
- case 1: // Green
- return_color = QColor(0, 255, 0);
- break;
- case 2: // Red
- return_color = QColor(255, 0, 0);
- break;
- case 3: // Orange
- return_color = QColor(255, 165, 0);
- break;
- case 4: // Blue
- return_color = QColor(45, 150, 255);
- break;
- case 5: // Yellow
- return_color = QColor(255, 255, 0);
- break;
- case 6: // Pink
- return_color = QColor(255, 192, 203);
- break;
- case 7: // Cyan
- return_color = QColor(0, 255, 255);
- break;
- case 8: // Grey
- return_color = QColor(187, 187, 187);
- break;
- default:
- return_color = QColor(255, 255, 255);
- break;
- }
QString design_ini_path = get_base_path() + "misc/" + p_chat + "/config.ini";
QString default_path = get_base_path() + "misc/default/config.ini";
QString f_result = read_design_ini("c" + p_identifier, design_ini_path);