Mamanyonyo/atrooney-online-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed a bug with the rainbow colour and inline colours.

Browse Source 
You can now use all the inline commands when your overall text colour is
rainbow, like with every other overall text colour.
This commit is contained in:
Cerapter 2018-12-18 00:53:23 +01:00
parent 80af3fb3ff
commit 7ce1851ee5
1 changed files with 28 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
courtroom.cpp
View File

@ -2055,33 +2055,6 @@ void Courtroom::chat_tick()
if (f_character == " ") if (f_character == " ")
ui_vp_message->insertPlainText(" "); ui_vp_message->insertPlainText(" ");
else if (m_chatmessage[TEXT_COLOR].toInt() == RAINBOW)
{
QString html_color;
switch (rainbow_counter)
{
case 0:
html_color = get_text_color(QString::number(RED)).name();
break;
case 1:
html_color = get_text_color(QString::number(ORANGE)).name();
break;
case 2:
html_color = get_text_color(QString::number(YELLOW)).name();
break;
case 3:
html_color = get_text_color(QString::number(GREEN)).name();
break;
default:
html_color = get_text_color(QString::number(BLUE)).name();
rainbow_counter = -1;
}
++rainbow_counter;
ui_vp_message->insertHtml("<font color=\"" + html_color + "\">" + f_character + "</font>");
}
// Escape character. // Escape character.
else if (f_character == "\\" and !next_character_is_not_special) else if (f_character == "\\" and !next_character_is_not_special)
@ -2245,6 +2218,34 @@ void Courtroom::chat_tick()
} }
else else
{ {
if (m_chatmessage[TEXT_COLOR].toInt() == RAINBOW)
{
QString html_color;
switch (rainbow_counter)
{
case 0:
html_color = get_text_color(QString::number(RED)).name();
break;
case 1:
html_color = get_text_color(QString::number(ORANGE)).name();
break;
case 2:
html_color = get_text_color(QString::number(YELLOW)).name();
break;
case 3:
html_color = get_text_color(QString::number(GREEN)).name();
break;
default:
html_color = get_text_color(QString::number(BLUE)).name();
rainbow_counter = -1;
}
++rainbow_counter;
ui_vp_message->insertHtml("<font color=\"" + html_color + "\">" + f_character + "</font>");
}
else
ui_vp_message->insertHtml(f_character); ui_vp_message->insertHtml(f_character);
} }