Mercurial > mm7
comparison mm7_6.cpp @ 1959:4fbffad6e011
pActorBuffs[15] to pActorBuffs[ACTOR_BUFF_SHIELD]
author | Grumpy7 |
---|---|
date | Fri, 25 Oct 2013 11:19:41 -0700 |
parents | 95095c2a5e19 |
children | f92fc67d66cb |
comparison
equal
deleted
inserted
replaced
1958:95095c2a5e19 | 1959:4fbffad6e011 |
---|---|
324 v4 = LODWORD(pActor->pActorBuffs[19].uExpireTime) == 0; | 324 v4 = LODWORD(pActor->pActorBuffs[19].uExpireTime) == 0; |
325 break; | 325 break; |
326 } | 326 } |
327 case 17: | 327 case 17: |
328 { | 328 { |
329 if ( SHIDWORD(pActor->pActorBuffs[15].uExpireTime) < 0 ) | 329 if ( SHIDWORD(pActor->pActorBuffs[ACTOR_BUFF_SHIELD].uExpireTime) < 0 ) |
330 return 1; | 330 return 1; |
331 if ( SHIDWORD(pActor->pActorBuffs[15].uExpireTime) > 0 ) | 331 if ( SHIDWORD(pActor->pActorBuffs[ACTOR_BUFF_SHIELD].uExpireTime) > 0 ) |
332 return 0; | 332 return 0; |
333 v3 = 0; | 333 v3 = 0; |
334 v4 = LODWORD(pActor->pActorBuffs[15].uExpireTime) == 0; | 334 v4 = LODWORD(pActor->pActorBuffs[ACTOR_BUFF_SHIELD].uExpireTime) == 0; |
335 break; | 335 break; |
336 } | 336 } |
337 case 38: | 337 case 38: |
338 { | 338 { |
339 if ( SHIDWORD(pActor->pActorBuffs[16].uExpireTime) < 0 ) | 339 if ( SHIDWORD(pActor->pActorBuffs[16].uExpireTime) < 0 ) |
405 v5 = pActor->pMonsterInfo.uAC; | 405 v5 = pActor->pMonsterInfo.uAC; |
406 v6 = 0; | 406 v6 = 0; |
407 if ( (signed __int64)pActor->pActorBuffs[ACTOR_BUFF_SOMETHING_THAT_HALVES_AC].uExpireTime > 0 ) | 407 if ( (signed __int64)pActor->pActorBuffs[ACTOR_BUFF_SOMETHING_THAT_HALVES_AC].uExpireTime > 0 ) |
408 v5 /= 2; | 408 v5 /= 2; |
409 if ( (signed __int64)pActor->pActorBuffs[ACTOR_BUFF_HOUR_OF_POWER].uExpireTime > 0 ) | 409 if ( (signed __int64)pActor->pActorBuffs[ACTOR_BUFF_HOUR_OF_POWER].uExpireTime > 0 ) |
410 v6 = pActor->pActorBuffs[15].uPower; | 410 v6 = pActor->pActorBuffs[ACTOR_BUFF_SHIELD].uPower; |
411 if ( (signed __int64)pActor->pActorBuffs[16].uExpireTime > 0 && pActor->pActorBuffs[16].uPower > v6 ) | 411 if ( (signed __int64)pActor->pActorBuffs[16].uExpireTime > 0 && pActor->pActorBuffs[16].uPower > v6 ) |
412 v6 = pActor->pActorBuffs[16].uPower; | 412 v6 = pActor->pActorBuffs[16].uPower; |
413 v7 = v6 + v5; | 413 v7 = v6 + v5; |
414 if ( a3 ) | 414 if ( a3 ) |
415 v8 = pPlayer->GetRangedAttack(); | 415 v8 = pPlayer->GetRangedAttack(); |