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

what was graphmeme even fot

Browse Source
This commit is contained in:
sD 2020-02-23 12:28:07 +01:00
parent 1291e776b6
commit 4af8ba9c38
1 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/courtroom.cpp
View File

@ -2361,7 +2361,6 @@ void Courtroom::chat_tick()
//do not perform heavy operations here //do not perform heavy operations here
QString f_message = m_chatmessage[MESSAGE]; QString f_message = m_chatmessage[MESSAGE];
f_message.remove(0, tick_pos);
// Due to our new text speed system, we always need to stop the timer now. // Due to our new text speed system, we always need to stop the timer now.
chat_tick_timer->stop(); chat_tick_timer->stop();
@ -2376,7 +2375,7 @@ void Courtroom::chat_tick()
f_message.remove(0,2); f_message.remove(0,2);
} }
if (f_message.size() == 0 || tick_pos >= f_message.size()) if (tick_pos >= f_message.size())
{ {
text_state = 2; text_state = 2;
if (anim_state != 4) if (anim_state != 4)
@ -2388,21 +2387,9 @@ void Courtroom::chat_tick()
else else
{ {
QTextBoundaryFinder tbf(QTextBoundaryFinder::Grapheme, f_message); QString f_character = f_message.at(tick_pos);
QString f_character;
int f_char_length;
tbf.toNextBoundary();
if (tbf.position() == -1)
f_character = f_message;
else
f_character = f_message.left(tbf.position());
f_char_length = f_character.length();
f_character = f_character.toHtmlEscaped(); f_character = f_character.toHtmlEscaped();
if (f_character == " ") if (f_character == " ")
ui_vp_message->insertPlainText(" "); ui_vp_message->insertPlainText(" ");
@ -2507,7 +2494,7 @@ void Courtroom::chat_tick()
else else
{ {
next_character_is_not_special = true; next_character_is_not_special = true;
tick_pos -= f_char_length; tick_pos--;
} }
} }
@ -2528,7 +2515,7 @@ void Courtroom::chat_tick()
else else
{ {
next_character_is_not_special = true; next_character_is_not_special = true;
tick_pos -= f_char_length; tick_pos--;
} }
} }
@ -2572,7 +2559,11 @@ void Courtroom::chat_tick()
case INLINE_GREY: case INLINE_GREY:
ui_vp_message->insertHtml("<font color=\""+ get_text_color("_inline_grey").name() +"\">" + f_character + "</font>"); ui_vp_message->insertHtml("<font color=\""+ get_text_color("_inline_grey").name() +"\">" + f_character + "</font>");
break; break;
default:
ui_vp_message->insertHtml(f_character);
break;
} }
} }
else else
{ {
@ -2623,7 +2614,7 @@ void Courtroom::chat_tick()
if(blank_blip) if(blank_blip)
qDebug() << "blank_blip found true"; qDebug() << "blank_blip found true";
if (f_character != ' ' || blank_blip) if (f_message.at(tick_pos) != ' ' || blank_blip)
{ {
if (blip_pos % blip_rate == 0 && !formatting_char) if (blip_pos % blip_rate == 0 && !formatting_char)
@ -2635,7 +2626,7 @@ void Courtroom::chat_tick()
++blip_pos; ++blip_pos;
} }
tick_pos += f_char_length; ++tick_pos;
// Restart the timer, but according to the newly set speeds, if there were any. // Restart the timer, but according to the newly set speeds, if there were any.
// Keep the speed at bay. // Keep the speed at bay.
@ -2662,7 +2653,6 @@ void Courtroom::chat_tick()
} }
} }
void Courtroom::show_testimony() void Courtroom::show_testimony()
{ {
if (!testimony_in_progress || m_chatmessage[SIDE] != "wit") if (!testimony_in_progress || m_chatmessage[SIDE] != "wit")
@ -2862,6 +2852,8 @@ void Courtroom::handle_song(QStringList *p_contents)
QString f_song_clear = f_song; QString f_song_clear = f_song;
int n_char = f_contents.at(1).toInt(); int n_char = f_contents.at(1).toInt();
qDebug() << "playing song "+f_song;
if (n_char < 0 || n_char >= char_list.size()) if (n_char < 0 || n_char >= char_list.size())
{ {
music_player->play(f_song); music_player->play(f_song);