comparison mm7_6.cpp @ 1057:37498d2cceed

Слияние
author Ritor1
date Thu, 23 May 2013 21:37:22 +0600
parents d48c762de563
children 9456f2ed5ff9
comparison
equal deleted inserted replaced
1056:86a7e8f9ca33 1057:37498d2cceed
7444 else 7444 else
7445 pParty->uFlags2 |= PARTY_FLAGS_2_RUNNING; 7445 pParty->uFlags2 |= PARTY_FLAGS_2_RUNNING;
7446 } 7446 }
7447 7447
7448 //pParty->uFlags2 |= PARTY_FLAGS_2_RUNNING; 7448 //pParty->uFlags2 |= PARTY_FLAGS_2_RUNNING;
7449 for ( uint i = 0; i < 30; ++i ) 7449
7450
7451 // WUT? double event trigger
7452 /*for ( uint i = 0; i < 30; ++i )
7450 { 7453 {
7451 if ( pKeyActionMap->pToggleTypes[i] ) 7454 if ( pKeyActionMap->pToggleTypes[i] )
7452 v14 = pGame->pKeyboardInstance->WasKeyPressed(pKeyActionMap->pVirtualKeyCodesMapping[i]); 7455 v14 = pGame->pKeyboardInstance->WasKeyPressed(pKeyActionMap->pVirtualKeyCodesMapping[i]);
7453 else 7456 else
7454 v14 = pGame->pKeyboardInstance->IsKeyBeingHeld(pKeyActionMap->pVirtualKeyCodesMapping[i]); 7457 v14 = pGame->pKeyboardInstance->IsKeyBeingHeld(pKeyActionMap->pVirtualKeyCodesMapping[i]);
7455 if ( v14 && i == 9 ) 7458 if ( v14 )
7456 { 7459 {
7457 if ( !pCurrentScreen ) 7460 if (pCurrentScreen == SCREEN_GAME)
7458 { 7461 {
7459 pMessageQueue_50CBD0->AddMessage(UIMSG_Game_Action, 0, 0); 7462 pMessageQueue_50CBD0->AddMessage(UIMSG_Game_Action, 0, 0);
7460 continue; 7463 continue;
7461 } 7464 }
7462 if ( pCurrentScreen == SCREEN_NPC_DIALOGUE || pCurrentScreen == SCREEN_BRANCHLESS_NPC_DIALOG ) 7465 if ( pCurrentScreen == SCREEN_NPC_DIALOGUE || pCurrentScreen == SCREEN_BRANCHLESS_NPC_DIALOG )
7478 pMessageQueue_50CBD0->uNumMessages = 0; 7481 pMessageQueue_50CBD0->uNumMessages = 0;
7479 } 7482 }
7480 //pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 0, 0); 7483 //pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 0, 0);
7481 } 7484 }
7482 } 7485 }
7483 } 7486 }*/
7484 if ( !pEventTimer->bPaused ) 7487 if ( !pEventTimer->bPaused )
7485 { 7488 {
7486 for ( uint i = 0; i < 30; ++i ) 7489 for ( uint i = 0; i < 30; ++i )
7487 { 7490 {
7488 inputAction = (InputAction)i; 7491 inputAction = (InputAction)i;
7697 pMessageQueue_50CBD0->AddMessage(UIMSG_Attack, 0, 0); 7700 pMessageQueue_50CBD0->AddMessage(UIMSG_Attack, 0, 0);
7698 break; 7701 break;
7699 } 7702 }
7700 else 7703 else
7701 { 7704 {
7702 /* if ( dword_50C9E8 < 40 )
7703 {
7704 dword_50C9EC[3 * dword_50C9E8] = 25;
7705 dword_50C9EC[3 * dword_50C9E8 + 1] = 0;
7706 dword_50C9EC[3 * dword_50C9E8 + 2] = 0;
7707 ++dword_50C9E8;
7708 }*/
7709 pMessageQueue_50C9E8->AddMessage(UIMSG_CastQuickSpell, 0, 0); 7705 pMessageQueue_50C9E8->AddMessage(UIMSG_CastQuickSpell, 0, 0);
7710 } 7706 }
7711 break; 7707 break;
7712 case INPUT_Attack: 7708 case INPUT_Attack:
7713 if (pCurrentScreen != SCREEN_GAME) 7709 if (pCurrentScreen != SCREEN_GAME)
7817 break; 7813 break;
7818 } 7814 }
7819 } 7815 }
7820 } 7816 }
7821 } 7817 }
7822 if (pGame->pKeyboardInstance->bUsingAsynKeyboard)
7823 {
7824 AsyncKeyboard::LeaveCriticalSection();
7825 //v16 = pAsyncKeyboard;
7826 AsyncKeyboard::EnterCriticalSection();
7827 memset((char *)pAsyncKeyboard + 521, 0, 0x100u);
7828 AsyncKeyboard::LeaveCriticalSection();
7829 }
7830 } 7818 }