Mercurial > mm7

comparison Indoor.cpp @ 1167:15ad868d972f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pPartyBuffs - change plain numbers to enums
author Grumpy7
date Tue, 04 Jun 2013 18:29:35 +0200
parents 29a8defbad9e
children 02e2a5c1ebc0 33b30398e286
comparison
equal deleted inserted replaced
1166:11cda4934da3 1167:15ad868d972f
4192 v0->vVelocity.z = v56; 4192 v0->vVelocity.z = v56;
4193 goto LABEL_120; 4193 goto LABEL_120;
4194 } 4194 }
4195 if ( v0->GetActorsRelation(0) ) 4195 if ( v0->GetActorsRelation(0) )
4196 { 4196 {
4197 v51 = __OFSUB__(HIDWORD(pParty->pPartyBuffs[11].uExpireTime), v22); 4197 v51 = __OFSUB__(HIDWORD(pParty->pPartyBuffs[PARTY_BUFF_INVISIBILITY].uExpireTime), v22);
4198 v49 = HIDWORD(pParty->pPartyBuffs[11].uExpireTime) == v22; 4198 v49 = HIDWORD(pParty->pPartyBuffs[PARTY_BUFF_INVISIBILITY].uExpireTime) == v22;
4199 v50 = HIDWORD(pParty->pPartyBuffs[11].uExpireTime) - v22 < 0; 4199 v50 = HIDWORD(pParty->pPartyBuffs[PARTY_BUFF_INVISIBILITY].uExpireTime) - v22 < 0;
4200 v0->vVelocity.y = v22; 4200 v0->vVelocity.y = v22;
4201 v0->vVelocity.x = v22; 4201 v0->vVelocity.x = v22;
4202 if ( !(v50 ^ v51) 4202 if ( !(v50 ^ v51)
4203 && (!((unsigned __int8)(v50 ^ v51) | v49) || LODWORD(pParty->pPartyBuffs[11].uExpireTime) > v22) ) 4203 && (!((unsigned __int8)(v50 ^ v51) | v49) || LODWORD(pParty->pPartyBuffs[PARTY_BUFF_INVISIBILITY].uExpireTime) > v22) )
4204 pParty->pPartyBuffs[11].Reset(); 4204 pParty->pPartyBuffs[PARTY_BUFF_INVISIBILITY].Reset();
4205 viewparams->bRedrawGameUI = 1; 4205 viewparams->bRedrawGameUI = 1;
4206 goto LABEL_119; 4206 goto LABEL_119;
4207 } 4207 }
4208 v36 = stru_721530.uFaceID; 4208 v36 = stru_721530.uFaceID;
4209 LABEL_118: 4209 LABEL_118: