Commit e046f274 authored by VanillaSalt's avatar VanillaSalt

revise

parent fb917639
......@@ -1577,7 +1577,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
break;
}
case irr::KEY_KEY_R: {
if(!event.KeyInput.PressedDown)
if(!event.KeyInput.PressedDown && !mainGame->env->hasFocus(mainGame->ebChatInput))
mainGame->textFont->setTransparency(true);
break;
}
......@@ -1588,7 +1588,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
case irr::KEY_F6:
case irr::KEY_F7: {
if(!event.KeyInput.PressedDown && !mainGame->dInfo.isReplay && mainGame->dInfo.player_type != 7 && mainGame->dInfo.isStarted
&& !mainGame->wCardDisplay->isVisible()) {
&& !mainGame->wCardDisplay->isVisible() && !mainGame->env->hasFocus(mainGame->ebChatInput)) {
int loc_id = 0;
display_cards.clear();
switch(event.KeyInput.Key) {
......
Subproject commit 6a44f18c16c8848139c9e5c26f8aec0623b7900c
Subproject commit f7089e78827fea0aebc245639b27f59f76f5f35f
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