Mercurial > mm7

comparison mm7_4.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 0dbf6c4dd029 33b30398e286
comparison
equal deleted inserted replaced
1166:11cda4934da3 1167:15ad868d972f
1923 { 1923 {
1924 if ( !(pParty->pPartyBuffs[PARTY_BUFF_FLY].uFlags & 1) ) 1924 if ( !(pParty->pPartyBuffs[PARTY_BUFF_FLY].uFlags & 1) )
1925 { // colliding with something in the air - fall down 1925 { // colliding with something in the air - fall down
1926 v5 = v4 * pParty->pPartyBuffs[PARTY_BUFF_FLY].uPower; 1926 v5 = v4 * pParty->pPartyBuffs[PARTY_BUFF_FLY].uPower;
1927 //__debugbreak(); 1927 //__debugbreak();
1928 v6 = (int *)&pParty->pPlayers[pParty->pPartyBuffs[PARTY_BUFF_FLY].uCaster].pConditions[0];//&stru_AA1058[4].pSounds[6972 * pParty->pPartyBuffs[7].uCaster + 2000]; 1928 v6 = (int *)&pParty->pPlayers[pParty->pPartyBuffs[PARTY_BUFF_FLY].uCaster].pConditions[0];//&stru_AA1058[4].pSounds[6972 * pParty->pPartyBuffs[PARTY_BUFF_FLY].uCaster + 2000];
1929 v7 = *v6 < v5; 1929 v7 = *v6 < v5;
1930 *v6 -= v5; 1930 *v6 -= v5;
1931 if ( v7 ) 1931 if ( v7 )
1932 { 1932 {
1933 *v6 = 0; 1933 *v6 = 0;
1944 if (pParty->uFlags & PARTY_FLAGS_1_STANDING_ON_WATER ) 1944 if (pParty->uFlags & PARTY_FLAGS_1_STANDING_ON_WATER )
1945 { 1945 {
1946 if ( !(pParty->pPartyBuffs[PARTY_BUFF_WATER_WALK].uFlags & 1) ) 1946 if ( !(pParty->pPartyBuffs[PARTY_BUFF_WATER_WALK].uFlags & 1) )
1947 { // taking on water 1947 { // taking on water
1948 //__debugbreak(); 1948 //__debugbreak();
1949 v8 = (int *)&pParty->pPlayers[pParty->pPartyBuffs[PARTY_BUFF_WATER_WALK].uCaster].pConditions[0];//&stru_AA1058[4].pSounds[6972 * pParty->pPartyBuffs[18].uCaster + 2000]; 1949 v8 = (int *)&pParty->pPlayers[pParty->pPartyBuffs[PARTY_BUFF_WATER_WALK].uCaster].pConditions[0];//&stru_AA1058[4].pSounds[6972 * pParty->pPartyBuffs[PARTY_BUFF_WATER_WALK].uCaster + 2000];
1950 v7 = *v8 < v4; 1950 v7 = *v8 < v4;
1951 *v8 -= v4; 1951 *v8 -= v4;
1952 if ( v7 ) 1952 if ( v7 )
1953 { 1953 {
1954 *v8 = 0; 1954 *v8 = 0;
1988 goto LABEL_19; 1988 goto LABEL_19;
1989 } 1989 }
1990 } 1990 }
1991 a1.uObjectDescID = v10; 1991 a1.uObjectDescID = v10;
1992 a1.field_60_distance_related_prolly_lod = 0; 1992 a1.field_60_distance_related_prolly_lod = 0;
1993 v12 = 8 * pParty->pPartyBuffs[10].uCaster; 1993 v12 = 8 * pParty->pPartyBuffs[PARTY_BUFF_IMMOLATION].uCaster;
1994 LOBYTE(v12) = v12 | OBJECT_Player; 1994 LOBYTE(v12) = v12 | OBJECT_Player;
1995 a1.uAttributes = 0; 1995 a1.uAttributes = 0;
1996 a1.uSectorID = 0; 1996 a1.uSectorID = 0;
1997 a1.uSpriteFrameID = 0; 1997 a1.uSpriteFrameID = 0;
1998 a1.spell_caster_pid = v12; 1998 a1.spell_caster_pid = v12;
2621 if ( v43 && (signed __int64)v21->pPlayerBuffs[7].uExpireTime <= 0 ) 2621 if ( v43 && (signed __int64)v21->pPlayerBuffs[7].uExpireTime <= 0 )
2622 v21->SetCondition(1u, 0); 2622 v21->SetCondition(1u, 0);
2623 ++v62; 2623 ++v62;
2624 } 2624 }
2625 while ( (signed int)v62 <= (signed int)&pPlayers[4] ); 2625 while ( (signed int)v62 <= (signed int)&pPlayers[4] );
2626 v46 = (signed __int64)pParty->pPartyBuffs[8].uExpireTime > 0; 2626 v46 = (signed __int64)pParty->pPartyBuffs[PARTY_BUFF_HASTE].uExpireTime > 0;
2627 2627
2628 for (uint i = 0; i < 20; ++i) 2628 for (uint i = 0; i < 20; ++i)
2629 { 2629 {
2630 if (pParty->pPartyBuffs[i]._4585CA(pParty->uTimePlayed) == 1) 2630 if (pParty->pPartyBuffs[i]._4585CA(pParty->uTimePlayed) == 1)
2631 viewparams->bRedrawGameUI = 1; 2631 viewparams->bRedrawGameUI = 1;
2632 } 2632 }
2633 2633
2634 if ( v46 && (signed __int64)pParty->pPartyBuffs[8].uExpireTime <= 0 ) 2634 if ( v46 && (signed __int64)pParty->pPartyBuffs[PARTY_BUFF_HASTE].uExpireTime <= 0 )
2635 { 2635 {
2636 for (uint i = 0; i < 4; ++i) 2636 for (uint i = 0; i < 4; ++i)
2637 pParty->pPlayers[i].SetCondition(1, 0); 2637 pParty->pPlayers[i].SetCondition(1, 0);
2638 } 2638 }
2639 2639