Mercurial > mm7

comparison Keyboard.cpp @ 2402:8cee51ce4382

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
included directx 11
author Ritor1
date Mon, 14 Jul 2014 10:03:44 +0600
parents 13e15d77b0f8
children f4af3b203f65
comparison
equal deleted inserted replaced
2400:ecd1dd95ec49 2402:8cee51ce4382
527 v14 = pGame->pKeyboardInstance->IsKeyBeingHeld(pKeyActionMap->pVirtualKeyCodesMapping[i]); 527 v14 = pGame->pKeyboardInstance->IsKeyBeingHeld(pKeyActionMap->pVirtualKeyCodesMapping[i]);
528 if ( v14 ) 528 if ( v14 )
529 { 529 {
530 if (pCurrentScreen == SCREEN_GAME) 530 if (pCurrentScreen == SCREEN_GAME)
531 { 531 {
532 pMessageQueue_50CBD0->AddMessage(UIMSG_Game_Action, 0, 0); 532 pMessageQueue_50CBD0->AddGUIMessage(UIMSG_Game_Action, 0, 0);
533 continue; 533 continue;
534 } 534 }
535 if ( pCurrentScreen == SCREEN_NPC_DIALOGUE || pCurrentScreen == SCREEN_BRANCHLESS_NPC_DIALOG ) 535 if ( pCurrentScreen == SCREEN_NPC_DIALOGUE || pCurrentScreen == SCREEN_BRANCHLESS_NPC_DIALOG )
536 { 536 {
537 v15 = pMessageQueue_50CBD0->uNumMessages; 537 v15 = pMessageQueue_50CBD0->uNumMessages;
548 ++pMessageQueue_50CBD0->uNumMessages; 548 ++pMessageQueue_50CBD0->uNumMessages;
549 continue; 549 continue;
550 } 550 }
551 pMessageQueue_50CBD0->uNumMessages = 0; 551 pMessageQueue_50CBD0->uNumMessages = 0;
552 } 552 }
553 //pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 0, 0); 553 //pMessageQueue_50CBD0->AddGUIMessage(UIMSG_Escape, 0, 0);
554 } 554 }
555 } 555 }
556 }*/ 556 }*/
557 if ( !pEventTimer->bPaused ) 557 if ( !pEventTimer->bPaused )
558 { 558 {
759 spell_price = pSpellDatas[pPlayers[uActiveCharacter]->uQuickSpell].uMasterLevelMana) : 759 spell_price = pSpellDatas[pPlayers[uActiveCharacter]->uQuickSpell].uMasterLevelMana) :
760 spell_price = pSpellDatas[pPlayers[uActiveCharacter]->uQuickSpell].uMagisterLevelMana, 760 spell_price = pSpellDatas[pPlayers[uActiveCharacter]->uQuickSpell].uMagisterLevelMana,
761 spell_price > pPlayers[uActiveCharacter]->sMana) ) 761 spell_price > pPlayers[uActiveCharacter]->sMana) )
762 { 762 {
763 pPartyActionQueue = pPartyActionQueue; 763 pPartyActionQueue = pPartyActionQueue;
764 pMessageQueue_50CBD0->AddMessage(UIMSG_Attack, 0, 0); 764 pMessageQueue_50CBD0->AddGUIMessage(UIMSG_Attack, 0, 0);
765 break; 765 break;
766 } 766 }
767 else 767 else
768 pMessageQueue_50C9E8->AddMessage(UIMSG_CastQuickSpell, 0, 0); 768 pMessageQueue_50C9E8->AddGUIMessage(UIMSG_CastQuickSpell, 0, 0);
769 break; 769 break;
770 case INPUT_Attack: 770 case INPUT_Attack:
771 if (pCurrentScreen != SCREEN_GAME) 771 if (pCurrentScreen != SCREEN_GAME)
772 break; 772 break;
773 if (pParty->bTurnBasedModeOn == true && pTurnEngine->turn_stage == TE_MOVEMENT) 773 if (pParty->bTurnBasedModeOn == true && pTurnEngine->turn_stage == TE_MOVEMENT)
774 { 774 {
775 pTurnEngine->field_18 |= TE_FLAG_8; 775 pTurnEngine->field_18 |= TE_FLAG_8;
776 break; 776 break;
777 } 777 }
778 pMessageQueue_50CBD0->AddMessage(UIMSG_Attack, 0, 0); 778 pMessageQueue_50CBD0->AddGUIMessage(UIMSG_Attack, 0, 0);
779 break; 779 break;
780 case INPUT_EventTrigger: 780 case INPUT_EventTrigger:
781 if (pCurrentScreen == SCREEN_GAME) 781 if (pCurrentScreen == SCREEN_GAME)
782 { 782 {
783 pMessageQueue_50CBD0->AddMessage(UIMSG_Game_Action, 0, 0); 783 pMessageQueue_50CBD0->AddGUIMessage(UIMSG_Game_Action, 0, 0);
784 break; 784 break;
785 } 785 }
786 if ( pCurrentScreen == SCREEN_NPC_DIALOGUE ) 786 if ( pCurrentScreen == SCREEN_NPC_DIALOGUE )
787 { 787 {
788 if ( pMessageQueue_50CBD0->uNumMessages ) 788 if ( pMessageQueue_50CBD0->uNumMessages )
797 ++pMessageQueue_50CBD0->uNumMessages; 797 ++pMessageQueue_50CBD0->uNumMessages;
798 break; 798 break;
799 } 799 }
800 break; 800 break;
801 } 801 }
802 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 0, 0); 802 pMessageQueue_50CBD0->AddGUIMessage(UIMSG_Escape, 0, 0);
803 } 803 }
804 break; 804 break;
805 case INPUT_CharCycle: 805 case INPUT_CharCycle:
806 if ( pCurrentScreen == SCREEN_SPELL_BOOK ) 806 if ( pCurrentScreen == SCREEN_SPELL_BOOK )
807 break; 807 break;
808 808
809 pMessageQueue_50C9E8->AddMessage(UIMSG_CycleCharacters, 0, 0); 809 pMessageQueue_50C9E8->AddGUIMessage(UIMSG_CycleCharacters, 0, 0);
810 break; 810 break;
811 case INPUT_LookUp: 811 case INPUT_LookUp:
812 if ( pEventTimer->bPaused ) 812 if ( pEventTimer->bPaused )
813 break; 813 break;
814 partyAction = (PartyAction)7; 814 partyAction = (PartyAction)7;
845 partyAction = (PartyAction)14; 845 partyAction = (PartyAction)14;
846 pPartyActionQueue->Add(partyAction); 846 pPartyActionQueue->Add(partyAction);
847 } 847 }
848 break; 848 break;
849 case INPUT_ZoomIn: 849 case INPUT_ZoomIn:
850 pMessageQueue_50C9E8->AddMessage(UIMSG_ClickZoomOutBtn, 0, 0); 850 pMessageQueue_50C9E8->AddGUIMessage(UIMSG_ClickZoomOutBtn, 0, 0);
851 break; 851 break;
852 case INPUT_ZoomOut: 852 case INPUT_ZoomOut:
853 pMessageQueue_50C9E8->AddMessage(UIMSG_ClickZoomInBtn, 0, 0); 853 pMessageQueue_50C9E8->AddGUIMessage(UIMSG_ClickZoomInBtn, 0, 0);
854 break; 854 break;
855 case INPUT_AlwaysRun: 855 case INPUT_AlwaysRun:
856 bAlwaysRun = bAlwaysRun == 0; 856 bAlwaysRun = bAlwaysRun == 0;
857 break; 857 break;
858 default: 858 default: