Mercurial > mm7

comparison mm7_4.cpp @ 1340:22cb507446a4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
turnengine refactoring continue
author Gloval
date Sat, 06 Jul 2013 00:29:29 +0400
parents 8bfdc44cebfd
children b99aeb077d4f
comparison
equal deleted inserted replaced
1339:8bfdc44cebfd 1340:22cb507446a4
1873 if ( v21->pConditions[2] | v21->pConditions[12] | v21->pConditions[13] | v21->pConditions[14] | v21->pConditions[15] | v21->pConditions[16] ) 1873 if ( v21->pConditions[2] | v21->pConditions[12] | v21->pConditions[13] | v21->pConditions[14] | v21->pConditions[15] | v21->pConditions[16] )
1874 --v65; 1874 --v65;
1875 v43 = (signed __int64)v21->pPlayerBuffs[7].uExpireTime > 0; 1875 v43 = (signed __int64)v21->pPlayerBuffs[7].uExpireTime > 0;
1876 1876
1877 for (uint k = 0; k < 24; ++k) 1877 for (uint k = 0; k < 24; ++k)
1878 v21->pPlayerBuffs[k]._4585CA(pParty->uTimePlayed); 1878 v21->pPlayerBuffs[k].IsBuffExpiredToTime(pParty->uTimePlayed);
1879 1879
1880 if ( v43 && (signed __int64)v21->pPlayerBuffs[7].uExpireTime <= 0 ) 1880 if ( v43 && (signed __int64)v21->pPlayerBuffs[7].uExpireTime <= 0 )
1881 v21->SetCondition(1u, 0); 1881 v21->SetCondition(1u, 0);
1882 ++v62; 1882 ++v62;
1883 } 1883 }
1884 while ( (signed int)v62 <= (signed int)&pPlayers[4] ); 1884 while ( (signed int)v62 <= (signed int)&pPlayers[4] );
1885 v46 = (signed __int64)pParty->pPartyBuffs[PARTY_BUFF_HASTE].uExpireTime > 0; 1885 v46 = (signed __int64)pParty->pPartyBuffs[PARTY_BUFF_HASTE].uExpireTime > 0;
1886 1886
1887 for (uint i = 0; i < 20; ++i) 1887 for (uint i = 0; i < 20; ++i)
1888 { 1888 {
1889 if (pParty->pPartyBuffs[i]._4585CA(pParty->uTimePlayed) == 1) 1889 if (pParty->pPartyBuffs[i].IsBuffExpiredToTime(pParty->uTimePlayed) == 1)
1890 viewparams->bRedrawGameUI = 1; 1890 viewparams->bRedrawGameUI = 1;
1891 } 1891 }
1892 1892
1893 if ( v46 && (signed __int64)pParty->pPartyBuffs[PARTY_BUFF_HASTE].uExpireTime <= 0 ) 1893 if ( v46 && (signed __int64)pParty->pPartyBuffs[PARTY_BUFF_HASTE].uExpireTime <= 0 )
1894 { 1894 {