Mercurial > mm7

comparison Party.cpp @ 150:d92c78ab54fe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Tue, 12 Feb 2013 10:17:35 +0600
parents cca78efb377e
children 038a4d09406f
comparison
equal deleted inserted replaced
149:2b0c652cc165 150:d92c78ab54fe
95 95
96 v1 = this; 96 v1 = this;
97 v12 = 0; 97 v12 = 0;
98 if ( pParty->bTurnBasedModeOn == 1 ) 98 if ( pParty->bTurnBasedModeOn == 1 )
99 { 99 {
100 if ( pTurnEngine->field_4 != 2 || (pTurnEngine->pQueue[0].uPackedID & 7) != 4 ) 100 if ( pTurnEngine->field_4 != 2 || (pTurnEngine->pQueue[0].uPackedID & 7) != OBJECT_Player)
101 return 0; 101 return 0;
102 v2 = pTurnEngine->pQueue[0].uPackedID >> 3; 102 v2 = pTurnEngine->pQueue[0].uPackedID >> 3;
103 return v2 + 1; 103 return v2 + 1;
104 } 104 }
105 v4 = 0; 105 v4 = 0;