Mercurial > mm7

comparison UI/UiGame.cpp @ 2399:aad4f31aa297

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Grumpy7
date Thu, 10 Jul 2014 01:37:41 +0200
parents 79e750ba00b9 6a7309a847ea
children ecd1dd95ec49
comparison
equal deleted inserted replaced
2398:79e750ba00b9 2399:aad4f31aa297
658 if ( pGUIWindow2->receives_keyboard_input_2 != WINDOW_INPUT_IN_PROGRESS) 658 if ( pGUIWindow2->receives_keyboard_input_2 != WINDOW_INPUT_IN_PROGRESS)
659 { 659 {
660 if ( pGUIWindow2->receives_keyboard_input_2 == WINDOW_INPUT_CONFIRMED) 660 if ( pGUIWindow2->receives_keyboard_input_2 == WINDOW_INPUT_CONFIRMED)
661 { 661 {
662 pGUIWindow2->receives_keyboard_input_2 = WINDOW_INPUT_NONE; 662 pGUIWindow2->receives_keyboard_input_2 = WINDOW_INPUT_NONE;
663 strcpy(GameUI_Footer_TimedString.data(), (const char *)pKeyActionMap->pPressedKeysBuffer); 663 strcpy(GameUI_Footer_TimedString.data(), pKeyActionMap->pPressedKeysBuffer);
664 sub_4452BB(); 664 sub_4452BB();
665 return; 665 return;
666 } 666 }
667 if ( pGUIWindow2->receives_keyboard_input_2 != WINDOW_INPUT_CANCELLED) 667 if ( pGUIWindow2->receives_keyboard_input_2 != WINDOW_INPUT_CANCELLED)
668 return; 668 return;