1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00

Merge remote-tracking branch 'vcmi/develop' into battleint_refactor

This commit is contained in:
Ivan Savenko
2022-12-01 23:58:01 +02:00
106 changed files with 2330 additions and 315 deletions

View File

@@ -1038,12 +1038,10 @@ void CInGameConsole::keyPressed (const SDL_KeyboardEvent & key)
{
if(captureAllKeys)
{
captureAllKeys = false;
endEnteringText(false);
}
else if(SDLK_TAB == key.keysym.sym)
{
captureAllKeys = true;
startEnteringText();
}
break;
@@ -1052,7 +1050,6 @@ void CInGameConsole::keyPressed (const SDL_KeyboardEvent & key)
{
if(enteredText.size() > 0 && captureAllKeys)
{
captureAllKeys = false;
endEnteringText(true);
CCS->soundh->playSound("CHAT");
}
@@ -1133,6 +1130,8 @@ void CInGameConsole::startEnteringText()
if (statusBar)
{
captureAllKeys = true;
CSDL_Ext::startTextInput(&statusBar->pos);
enteredText = "_";
@@ -1145,6 +1144,8 @@ void CInGameConsole::startEnteringText()
void CInGameConsole::endEnteringText(bool printEnteredText)
{
captureAllKeys = false;
CSDL_Ext::stopTextInput();
prevEntDisp = -1;