Mercurial > mm7

comparison Viewport.cpp @ 1347:84db43e7db93

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Grumpy7
date Fri, 12 Jul 2013 23:08:35 +0200
parents 22cb507446a4
children 61010a655c94
comparison
equal deleted inserted replaced
1346:1434b36f4bdb 1347:84db43e7db93
465 return; 465 return;
466 } 466 }
467 pMessageQueue_50CBD0->AddMessage(UIMSG_StartNPCDialogue, v18, 0); 467 pMessageQueue_50CBD0->AddMessage(UIMSG_StartNPCDialogue, v18, 0);
468 return; 468 return;
469 } 469 }
470 if ( pParty->bTurnBasedModeOn == 1 && pTurnEngine->field_4 == 3 ) 470 if ( pParty->bTurnBasedModeOn == 1 && pTurnEngine->turn_stage == 3 )
471 { 471 {
472 pTurnEngine->field_18 |= 8; 472 pTurnEngine->field_18 |= TE_FLAG_8;
473 return; 473 return;
474 } 474 }
475 pMessageQueue_50CBD0->AddMessage(UIMSG_Attack, 0, 0); 475 pMessageQueue_50CBD0->AddMessage(UIMSG_Attack, 0, 0);
476 } 476 }
477 else 477 else
478 { 478 {
479 if ( pParty->bTurnBasedModeOn == 1 && pTurnEngine->field_4 == 3 ) 479 if ( pParty->bTurnBasedModeOn == 1 && pTurnEngine->turn_stage == 3 )
480 { 480 {
481 pParty->uFlags |= PARTY_FLAGS_1_FALLING; 481 pParty->uFlags |= PARTY_FLAGS_1_FALLING;
482 return; 482 return;
483 } 483 }
484 if ( uActiveCharacter && sub_427769_spell(pPlayers[uActiveCharacter]->uQuickSpell)) 484 if ( uActiveCharacter && sub_427769_spell(pPlayers[uActiveCharacter]->uQuickSpell))