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

fixed a bug where yellow text would not work

Browse Source
This commit is contained in:
David Skoland 2017-02-14 14:34:44 +01:00
parent bc2f15e4f1
commit 9e5598cbed
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
aoapplication.h
View File

@ -43,8 +43,6 @@ public:
unsigned int s_decryptor = 5; unsigned int s_decryptor = 5;
bool encryption_needed = true; bool encryption_needed = true;
//T0D0: make this obsolete and break into smaller bools
bool ao2_features = false;
bool yellow_text_enabled = false; bool yellow_text_enabled = false;
bool prezoom_enabled = false; bool prezoom_enabled = false;

3
courtroom.cpp
View File

@ -910,7 +910,7 @@ void Courtroom::on_chat_return_pressed()
if (text_color < 0) if (text_color < 0)
f_text_color = "0"; f_text_color = "0";
else if (text_color > 4 && !ao_app->ao2_features) else if (text_color > 4 && !ao_app->yellow_text_enabled)
f_text_color = "0"; f_text_color = "0";
else else
f_text_color = QString::number(text_color); f_text_color = QString::number(text_color);
@ -1341,6 +1341,7 @@ void Courtroom::set_text_color()
case YELLOW: case YELLOW:
ui_vp_message->setStyleSheet("background-color: rgba(0, 0, 0, 0);" ui_vp_message->setStyleSheet("background-color: rgba(0, 0, 0, 0);"
"color: yellow"); "color: yellow");
break;
default: default:
qDebug() << "W: undefined text color: " << m_chatmessage[TEXT_COLOR]; qDebug() << "W: undefined text color: " << m_chatmessage[TEXT_COLOR];
case WHITE: case WHITE:

5
packet_distribution.cpp
View File

@ -69,6 +69,8 @@ void AOApplication::ms_packet_received(AOPacket *p_packet)
} }
else if (header == "AO2CHECK") else if (header == "AO2CHECK")
{ {
send_ms_packet(new AOPacket("ID#AO2#" + get_version_string() + "#%"));
if (f_contents.size() < 1) if (f_contents.size() < 1)
goto end; goto end;
@ -81,9 +83,6 @@ void AOApplication::ms_packet_received(AOPacket *p_packet)
int f_major = version_contents.at(1).toInt(); int f_major = version_contents.at(1).toInt();
int f_minor = version_contents.at(2).toInt(); int f_minor = version_contents.at(2).toInt();
//qDebug() << "local version: " << get_version_string();
//qDebug() << "remote version: " << QString::number(f_release) << QString::number(f_major) << QString::number(f_minor);
if (get_release() > f_release) if (get_release() > f_release)
goto end; goto end;
else if (get_release() == f_release) else if (get_release() == f_release)