Mercurial > mm7

comparison mm7_4.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 77ad59c17864 cca78efb377e
children 9abdd40a107b
comparison
equal deleted inserted replaced
149:2b0c652cc165 150:d92c78ab54fe
1263 if ( v3 ) 1263 if ( v3 )
1264 { 1264 {
1265 do 1265 do
1266 { 1266 {
1267 v4 = *v3; 1267 v4 = *v3;
1268 if ( (v4 & 7) == 5 ) 1268 if ( (v4 & 7) == OBJECT_Decoration)
1269 { 1269 {
1270 v5 = &pLevelDecorations[(signed __int16)v4 >> 3]; 1270 v5 = &pLevelDecorations[(signed __int16)v4 >> 3];
1271 if ( !(v5->field_2 & 0x20) ) 1271 if ( !(v5->field_2 & 0x20) )
1272 { 1272 {
1273 v6 = &pDecorationList->pDecorations[v5->uDecorationDescID]; 1273 v6 = &pDecorationList->pDecorations[v5->uDecorationDescID];
3233 } 3233 }
3234 if ( pParty->bTurnBasedModeOn == 1 ) 3234 if ( pParty->bTurnBasedModeOn == 1 )
3235 { 3235 {
3236 if ( pTurnEngine->field_4 != 1 ) 3236 if ( pTurnEngine->field_4 != 1 )
3237 { 3237 {
3238 if ( (pTurnEngine->pQueue[0].uPackedID & 7) == 4 ) 3238 if ( (pTurnEngine->pQueue[0].uPackedID & 7) == OBJECT_Player)
3239 { 3239 {
3240 //v14 = 0; 3240 //v14 = 0;
3241 if ( pTurnEngine->uActorQueueSize > 0 ) 3241 if ( pTurnEngine->uActorQueueSize > 0 )
3242 { 3242 {
3243 //v15 = (char *)pTurnEngine->pQueue; 3243 //v15 = (char *)pTurnEngine->pQueue;
3244 for (uint i = 0; i < pTurnEngine->uActorQueueSize; ++i) 3244 for (uint i = 0; i < pTurnEngine->uActorQueueSize; ++i)
3245 { 3245 {
3246 auto pElem = pTurnEngine->pQueue + i; 3246 auto pElem = pTurnEngine->pQueue + i;
3247 3247
3248 if ( (pElem->uPackedID & 7) != 4 ) 3248 if ( (pElem->uPackedID & 7) != OBJECT_Player)
3249 break; 3249 break;
3250 v16 = dword_5079D0; 3250 v16 = dword_5079D0;
3251 if ( pParty->uFlags & 0x10 ) 3251 if ( pParty->uFlags & 0x10 )
3252 { 3252 {
3253 v16 = dword_5079CC; 3253 v16 = dword_5079CC;