Mercurial > mm7

comparison mm7_4.cpp @ 569:f451efdb7c8b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* Party buff icons drawing (right panel) * Water Walk works & draws * Fly works & draws * Invisibility sfx works * Some player buff icons draw
author Nomad
date Tue, 05 Mar 2013 16:14:22 +0200
parents fcbb3c281217
children 628694cd5744 346dc5fc2969
comparison
equal deleted inserted replaced
568:6f7d936edc9b 569:f451efdb7c8b
3422 v4 = (v0 - v2) / 5; 3422 v4 = (v0 - v2) / 5;
3423 if (pParty->FlyActive()) 3423 if (pParty->FlyActive())
3424 { 3424 {
3425 if ( pParty->bFlying ) 3425 if ( pParty->bFlying )
3426 { 3426 {
3427 if ( !(pParty->pPartyBuffs[7].uFlags & 1) ) 3427 if ( !(pParty->pPartyBuffs[PARTY_BUFF_FLY].uFlags & 1) )
3428 { 3428 { // colliding with something in the air - fall down
3429 v5 = v4 * pParty->pPartyBuffs[7].uPower; 3429 v5 = v4 * pParty->pPartyBuffs[PARTY_BUFF_FLY].uPower;
3430 __debugbreak(); 3430 //__debugbreak();
3431 v6 = (int *)&pParty->pPlayers[pParty->pPartyBuffs[7].uCaster].pConditions[0];//&stru_AA1058[4].pSounds[6972 * pParty->pPartyBuffs[7].uCaster + 2000]; 3431 v6 = (int *)&pParty->pPlayers[pParty->pPartyBuffs[PARTY_BUFF_FLY].uCaster].pConditions[0];//&stru_AA1058[4].pSounds[6972 * pParty->pPartyBuffs[7].uCaster + 2000];
3432 v7 = *v6 < v5; 3432 v7 = *v6 < v5;
3433 *v6 -= v5; 3433 *v6 -= v5;
3434 if ( v7 ) 3434 if ( v7 )
3435 { 3435 {
3436 *v6 = 0; 3436 *v6 = 0;
3439 v51 = 1; 3439 v51 = 1;
3440 } 3440 }
3441 } 3441 }
3442 } 3442 }
3443 } 3443 }
3444
3444 if (pParty->WaterWalkActive()) 3445 if (pParty->WaterWalkActive())
3445 { 3446 {
3446 if (pParty->uFlags & 0x80 ) 3447 if (pParty->uFlags & PARTY_FLAGS_1_STANDING_ON_WATER )
3447 { 3448 {
3448 if ( !(pParty->pPartyBuffs[18].uFlags & 1) ) 3449 if ( !(pParty->pPartyBuffs[PARTY_BUFF_WATER_WALK].uFlags & 1) )
3449 { 3450 { // taking on water
3450 __debugbreak(); 3451 //__debugbreak();
3451 v8 = (int *)&pParty->pPlayers[pParty->pPartyBuffs[18].uCaster].pConditions[0];//&stru_AA1058[4].pSounds[6972 * pParty->pPartyBuffs[18].uCaster + 2000]; 3452 v8 = (int *)&pParty->pPlayers[pParty->pPartyBuffs[PARTY_BUFF_WATER_WALK].uCaster].pConditions[0];//&stru_AA1058[4].pSounds[6972 * pParty->pPartyBuffs[18].uCaster + 2000];
3452 v7 = *v8 < v4; 3453 v7 = *v8 < v4;
3453 *v8 -= v4; 3454 *v8 -= v4;
3454 if ( v7 ) 3455 if ( v7 )
3455 { 3456 {
3456 *v8 = 0; 3457 *v8 = 0;
3457 LOBYTE(pParty->uFlags) &= 0x7Fu; 3458 pParty->uFlags &= ~PARTY_FLAGS_1_STANDING_ON_WATER;
3458 v51 = 1; 3459 v51 = 1;
3459 } 3460 }
3460 } 3461 }
3461 } 3462 }
3462 } 3463 }
3464
3463 if (pParty->ImmolationActive()) 3465 if (pParty->ImmolationActive())
3464 { 3466 {
3465 //SpriteObject::SpriteObject(&a1); 3467 //SpriteObject::SpriteObject(&a1);
3466 v9 = 0; 3468 v9 = 0;
3467 a3.z = 0; 3469 a3.z = 0;