Mercurial > mm7

comparison mm7_4.cpp @ 102:8a10c9780e17

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Fri, 08 Feb 2013 16:00:04 +0600
parents 2fb33d31ca0d b7ff791b1333
children 909822c91d47
comparison
equal deleted inserted replaced
101:2fb33d31ca0d 102:8a10c9780e17
3944 pParty->field_6FC = LODWORD(pParty->uTimePlayed) + 128; 3944 pParty->field_6FC = LODWORD(pParty->uTimePlayed) + 128;
3945 viewparams->bRedrawGameUI = 1; 3945 viewparams->bRedrawGameUI = 1;
3946 while ( 1 ) 3946 while ( 1 )
3947 { 3947 {
3948 if ( pPlayers[v12]->WearsItem(516, 3) 3948 if ( pPlayers[v12]->WearsItem(516, 3)
3949 || v13->HasEnchantedItemEquipped(71) 3949 || pPlayers[v12]->HasEnchantedItemEquipped(71)
3950 || (signed __int64)v13->pPlayerBuffs[23].uExpireTime > 0 ) 3950 || pPlayers[v12]->pPlayerBuffs[23].uExpireTime > 0 )
3951 { 3951 {
3952 v58 = 0; 3952 v58 = 0;
3953 } 3953 }
3954 else 3954 else
3955 { 3955 {