Mercurial > mm7

comparison mm7_6.cpp @ 140:f4d7a9a8c363

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Walk/run and other actions
author Nomad
date Tue, 12 Feb 2013 02:02:26 +0200
parents 9b0d651821f1
children cca78efb377e
comparison
equal deleted inserted replaced
139:7eeea515f5ff 140:f4d7a9a8c363
8919 pParty->uFlags2 &= ~PARTY_FLAGS_2_RUNNING; 8919 pParty->uFlags2 &= ~PARTY_FLAGS_2_RUNNING;
8920 else 8920 else
8921 pParty->uFlags2 |= PARTY_FLAGS_2_RUNNING; 8921 pParty->uFlags2 |= PARTY_FLAGS_2_RUNNING;
8922 } 8922 }
8923 8923
8924 pParty->uFlags2 |= PARTY_FLAGS_2_RUNNING; 8924 //pParty->uFlags2 |= PARTY_FLAGS_2_RUNNING;
8925 LABEL_6: 8925 LABEL_6:
8926 if ( !pEventTimer->bPaused ) 8926 if ( !pEventTimer->bPaused )
8927 { 8927 {
8928 inputAction = (InputAction)0; 8928 inputAction = (InputAction)0;
8929 pActionQueue = pPartyActionQueue; 8929 pActionQueue = pPartyActionQueue;
8947 if (pTurnEngine->field_4 != 1 && pTurnEngine->field_4 != 2 && pTurnEngine->uActionPointsLeft > 0 ) 8947 if (pTurnEngine->field_4 != 1 && pTurnEngine->field_4 != 2 && pTurnEngine->uActionPointsLeft > 0 )
8948 { 8948 {
8949 pTurnEngine->uActionPointsLeft -= 26; 8949 pTurnEngine->uActionPointsLeft -= 26;
8950 _do_move_forward: 8950 _do_move_forward:
8951 v5 = pActionQueue; 8951 v5 = pActionQueue;
8952 if ( pParty->uFlags2 & 2 ) 8952 if ( pParty->uFlags2 & PARTY_FLAGS_2_RUNNING)
8953 partyAction = PARTY_RunForward; 8953 partyAction = PARTY_RunForward;
8954 else 8954 else
8955 partyAction = PARTY_WalkForward; 8955 partyAction = PARTY_WalkForward;
8956 goto _add_action_and_continue; 8956 goto _add_action_and_continue;
8957 } 8957 }