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

Change @ and $ to \s and \f standing for s[hake] and f[lash].

Browse Source 
This is done because @ is used very often to refer to people, and $ is used to indicate cash money.
This commit is contained in:
Crystalwarrior 2020-03-25 00:42:20 +03:00
parent 825042b32c
commit f668d70ac5
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/courtroom.cpp
View File

@ -2169,7 +2169,7 @@ QString Courtroom::filter_ic_text(QString p_text, bool html, int target_pos, int
skip = true; skip = true;
} }
//Nothing related to colors here //Nothing related to colors here
else if (f_character == "{" || f_character == "}" || f_character == "@" || f_character == "$") else if (f_character == "{" || f_character == "}") //|| f_character == "@" || f_character == "$")
{ {
skip = true; skip = true;
} }
@ -2268,6 +2268,8 @@ QString Courtroom::filter_ic_text(QString p_text, bool html, int target_pos, int
check_pos_escaped += appendage.size(); check_pos_escaped += appendage.size();
skip = true; skip = true;
} }
if (f_character == "s" || f_character == "f") // screenshake/flash
skip = true;
ic_next_is_not_special = false; ic_next_is_not_special = false;
} }
@ -2636,19 +2638,6 @@ void Courtroom::chat_tick()
formatting_char = true; formatting_char = true;
} }
//Screenshake.
else if (f_character == "@")
{
this->do_screenshake();
formatting_char = true;
}
//Flash.
else if (f_character == "$")
{
this->do_flash();
formatting_char = true;
}
else else
{ {
//Parse markdown colors //Parse markdown colors
@ -2673,13 +2662,23 @@ void Courtroom::chat_tick()
{ {
if (f_character == "n") if (f_character == "n")
formatting_char = true; //it's a newline formatting_char = true; //it's a newline
if (f_character == "s") //Screenshake.
{
this->do_screenshake();
formatting_char = true;
}
if (f_character == "f")//Flash.
{
this->do_flash();
formatting_char = true;
}
next_character_is_not_special = false; next_character_is_not_special = false;
} }
if ((message_display_speed[current_display_speed] <= 0 && tick_pos < f_message.size()-1) || formatting_char) if ((message_display_speed[current_display_speed] <= 0 && tick_pos < f_message.size()-1) || formatting_char)
{ {
chat_tick_timer->start(0); //Don't bother rendering anything out as we're doing the SPEED. (there's latency otherwise) chat_tick_timer->start(0); //Don't bother rendering anything out as we're doing the SPEED. (there's latency otherwise)
if (!formatting_char || f_character == "n") if (!formatting_char || f_character == "n" || f_character == "f" || f_character == "s")
real_tick_pos += f_char_length; //Adjust the tick position for the scrollbar convenience real_tick_pos += f_char_length; //Adjust the tick position for the scrollbar convenience
} }
else else