Commit 98c786ae authored by nanahira's avatar nanahira

add chat back

parent 1ef3256a
...@@ -500,7 +500,7 @@ void DuelClient::HandleSTOCPacketLan(char* data, unsigned int len) { ...@@ -500,7 +500,7 @@ void DuelClient::HandleSTOCPacketLan(char* data, unsigned int len) {
else if(mainGame->wSinglePlay->isVisible()) else if(mainGame->wSinglePlay->isVisible())
mainGame->HideElement(mainGame->wSinglePlay); mainGame->HideElement(mainGame->wSinglePlay);
mainGame->ShowElement(mainGame->wHostPrepare); mainGame->ShowElement(mainGame->wHostPrepare);
if(!mainGame->chkIgnore1->isChecked()) //if(!mainGame->chkIgnore1->isChecked())
mainGame->wChat->setVisible(true); mainGame->wChat->setVisible(true);
mainGame->gMutex.Unlock(); mainGame->gMutex.Unlock();
mainGame->dInfo.duel_rule = pkt->info.duel_rule; mainGame->dInfo.duel_rule = pkt->info.duel_rule;
...@@ -613,7 +613,7 @@ void DuelClient::HandleSTOCPacketLan(char* data, unsigned int len) { ...@@ -613,7 +613,7 @@ void DuelClient::HandleSTOCPacketLan(char* data, unsigned int len) {
mainGame->btnM2->setVisible(false); mainGame->btnM2->setVisible(false);
mainGame->btnEP->setVisible(false); mainGame->btnEP->setVisible(false);
mainGame->btnShuffle->setVisible(false); mainGame->btnShuffle->setVisible(false);
if(!mainGame->chkIgnore1->isChecked()) //if(!mainGame->chkIgnore1->isChecked())
mainGame->wChat->setVisible(true); mainGame->wChat->setVisible(true);
mainGame->device->setEventReceiver(&mainGame->dField); mainGame->device->setEventReceiver(&mainGame->dField);
if(!mainGame->dInfo.isTag) { if(!mainGame->dInfo.isTag) {
......
...@@ -1812,10 +1812,12 @@ bool ClientField::OnCommonEvent(const irr::SEvent& event) { ...@@ -1812,10 +1812,12 @@ bool ClientField::OnCommonEvent(const irr::SEvent& event) {
} }
#endif #endif
case CHECKBOX_DISABLE_CHAT: { case CHECKBOX_DISABLE_CHAT: {
bool show = mainGame->is_building ? false : !mainGame->chkIgnore1->isChecked(); bool show = !mainGame->is_building;
mainGame->wChat->setVisible(show); mainGame->wChat->setVisible(show);
/*
if(!show) if(!show)
mainGame->ClearChatMsg(); mainGame->ClearChatMsg();
*/
return true; return true;
break; break;
} }
......
...@@ -306,7 +306,7 @@ ...@@ -306,7 +306,7 @@
!system 1280 开启音乐 !system 1280 开启音乐
!system 1281 按场景切换音乐 !system 1281 按场景切换音乐
!system 1282 数字灵摆图片 !system 1282 数字灵摆图片
!system 1290 禁用聊天功能 !system 1290 忽略对方发言
!system 1291 忽略观战者发言 !system 1291 忽略观战者发言
!system 1292 忽略时点 !system 1292 忽略时点
!system 1293 显示时点 !system 1293 显示时点
......
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