Commit 1ec53f50 authored by Fluorohydride's avatar Fluorohydride

Merge pull request #461 from matteoserva/master

fix chat
parents 3d1e16b7 4499da0c
...@@ -667,7 +667,7 @@ void Game::DrawSpec() { ...@@ -667,7 +667,7 @@ void Game::DrawSpec() {
attack_sv = 0; attack_sv = 0;
} }
for(int i = 0; i < 5; ++i) { for(int i = 0; i < 5; ++i) {
static unsigned int chatColor[10] = {0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xff8080ff, 0xffff4040}; static unsigned int chatColor[11] = {0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xff8080ff, 0xffff4040, 0xffff4040};
if(chatTiming[i]) { if(chatTiming[i]) {
chatTiming[i]--; chatTiming[i]--;
int w = textFont->getDimension(chatMsg[i].c_str()).Width; int w = textFont->getDimension(chatMsg[i].c_str()).Width;
......
...@@ -564,7 +564,7 @@ void DuelClient::HandleSTOCPacketLan(char* data, unsigned int len) { ...@@ -564,7 +564,7 @@ void DuelClient::HandleSTOCPacketLan(char* data, unsigned int len) {
else if(pkt->player == 3) else if(pkt->player == 3)
mainGame->AddChatMsg(msg, 3); mainGame->AddChatMsg(msg, 3);
else else
mainGame->AddChatMsg(msg, 9); mainGame->AddChatMsg(msg, 10);
} else { } else {
if(pkt->player == 0) if(pkt->player == 0)
mainGame->AddChatMsg(msg, 1); mainGame->AddChatMsg(msg, 1);
...@@ -575,7 +575,7 @@ void DuelClient::HandleSTOCPacketLan(char* data, unsigned int len) { ...@@ -575,7 +575,7 @@ void DuelClient::HandleSTOCPacketLan(char* data, unsigned int len) {
else if(pkt->player == 3) else if(pkt->player == 3)
mainGame->AddChatMsg(msg, 2); mainGame->AddChatMsg(msg, 2);
else else
mainGame->AddChatMsg(msg, 9); mainGame->AddChatMsg(msg, 10);
} }
} }
mainGame->gMutex.Unlock(); mainGame->gMutex.Unlock();
...@@ -593,7 +593,7 @@ void DuelClient::HandleSTOCPacketLan(char* data, unsigned int len) { ...@@ -593,7 +593,7 @@ void DuelClient::HandleSTOCPacketLan(char* data, unsigned int len) {
BufferIO::CopyWStr(pkt->msg, msg, 256); BufferIO::CopyWStr(pkt->msg, msg, 256);
msg[(len - 3) / 2] = 0; msg[(len - 3) / 2] = 0;
mainGame->gMutex.Lock(); mainGame->gMutex.Lock();
mainGame->AddChatMsg(msg, 9); mainGame->AddChatMsg(msg, 10);
mainGame->gMutex.Unlock(); mainGame->gMutex.Unlock();
} }
break; break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment