Mercurial > might-and-magic-trilogy

comparison mm7_6.cpp @ 89:ecbd9b6ccf52

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Mon, 29 Oct 2012 21:54:17 +0600
parents f9a33f75bae3
children 51a5b0dc3f30
comparison
equal deleted inserted replaced
88:6b46c3e15e21 89:ecbd9b6ccf52
8920 if ( v4 ) 8920 if ( v4 )
8921 { 8921 {
8922 switch ( inputAction ) 8922 switch ( inputAction )
8923 { 8923 {
8924 case INPUT_MoveForward: 8924 case INPUT_MoveForward:
8925 __debugbreak();
8926 if ( pCurrentScreen ) 8925 if ( pCurrentScreen )
8927 break; 8926 break;
8928 if (!pParty->bTurnBasedModeOn) 8927 if (!pParty->bTurnBasedModeOn)
8929 goto _do_move_forward; 8928 goto _do_move_forward;
8930 if (pTurnEngine->field_4 != 1 && pTurnEngine->field_4 != 2 && pTurnEngine->uActionPointsLeft > 0 ) 8929 if (pTurnEngine->field_4 != 1 && pTurnEngine->field_4 != 2 && pTurnEngine->uActionPointsLeft > 0 )