Mercurial > mm7

comparison mm7_6.cpp @ 1332:1e35cfed7928

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
turn engine file added
author Gloval
date Fri, 05 Jul 2013 01:46:44 +0400
parents bfde0563ecdc
children 22cb507446a4
comparison
equal deleted inserted replaced
1331:f0be1fecd642 1332:1e35cfed7928
3051 case INPUT_Pass: 3051 case INPUT_Pass:
3052 if ( pCurrentScreen ) 3052 if ( pCurrentScreen )
3053 break; 3053 break;
3054 if (pParty->bTurnBasedModeOn && pTurnEngine->field_4 == 3) 3054 if (pParty->bTurnBasedModeOn && pTurnEngine->field_4 == 3)
3055 { 3055 {
3056 pTurnEngine->field_18 |= 8u; 3056 pTurnEngine->field_18 |= TE_FLAG_8;
3057 break; 3057 break;
3058 } 3058 }
3059 if ( uActiveCharacter ) 3059 if ( uActiveCharacter )
3060 { 3060 {
3061 if ( !pPlayers[uActiveCharacter]->uTimeToRecovery ) 3061 if ( !pPlayers[uActiveCharacter]->uTimeToRecovery )
3071 case INPUT_Combat://if press ENTER 3071 case INPUT_Combat://if press ENTER
3072 if (pCurrentScreen == SCREEN_GAME) 3072 if (pCurrentScreen == SCREEN_GAME)
3073 { 3073 {
3074 if (pParty->bTurnBasedModeOn) 3074 if (pParty->bTurnBasedModeOn)
3075 { 3075 {
3076 if (pTurnEngine->field_4 == OBJECT_Actor || PID_TYPE(pTurnEngine->pQueue[0].uPackedID) == OBJECT_Player) 3076 if (pTurnEngine->field_4 == 3 || PID_TYPE(pTurnEngine->pQueue[0].uPackedID) == OBJECT_Player)
3077 { 3077 {
3078 pParty->bTurnBasedModeOn = 0; 3078 pParty->bTurnBasedModeOn = 0;
3079 pTurnEngine->End(true); 3079 pTurnEngine->End(true);
3080 } 3080 }
3081 } 3081 }
3089 case INPUT_CastReady: 3089 case INPUT_CastReady:
3090 if (pCurrentScreen != SCREEN_GAME) 3090 if (pCurrentScreen != SCREEN_GAME)
3091 break; 3091 break;
3092 if (pParty->bTurnBasedModeOn && pTurnEngine->field_4 == 3) 3092 if (pParty->bTurnBasedModeOn && pTurnEngine->field_4 == 3)
3093 { 3093 {
3094 pTurnEngine->field_18 |= 8u; 3094 pTurnEngine->field_18 |= TE_FLAG_8;
3095 break; 3095 break;
3096 } 3096 }
3097 if ( !uActiveCharacter ) 3097 if ( !uActiveCharacter )
3098 break; 3098 break;
3099 v8 = pPlayers[uActiveCharacter]->uQuickSpell; 3099 v8 = pPlayers[uActiveCharacter]->uQuickSpell;
3118 case INPUT_Attack: 3118 case INPUT_Attack:
3119 if (pCurrentScreen != SCREEN_GAME) 3119 if (pCurrentScreen != SCREEN_GAME)
3120 break; 3120 break;
3121 if (pParty->bTurnBasedModeOn == 1 && pTurnEngine->field_4 == 3) 3121 if (pParty->bTurnBasedModeOn == 1 && pTurnEngine->field_4 == 3)
3122 { 3122 {
3123 pTurnEngine->field_18 |= 8u; 3123 pTurnEngine->field_18 |= TE_FLAG_8;
3124 break; 3124 break;
3125 } 3125 }
3126 pMessageQueue_50CBD0->AddMessage(UIMSG_Attack, 0, 0); 3126 pMessageQueue_50CBD0->AddMessage(UIMSG_Attack, 0, 0);
3127 break; 3127 break;
3128 case INPUT_EventTrigger: 3128 case INPUT_EventTrigger: