comparison mm7_6.cpp @ 1960:f92fc67d66cb

pActorBuffs[16] to pActorBuffs[ACTOR_BUFF_STONESKIN]
author Grumpy7
date Fri, 25 Oct 2013 11:20:24 -0700
parents 4fbffad6e011
children 592d604088b3
comparison
equal deleted inserted replaced
1959:4fbffad6e011 1960:f92fc67d66cb
334 v4 = LODWORD(pActor->pActorBuffs[ACTOR_BUFF_SHIELD].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[ACTOR_BUFF_STONESKIN].uExpireTime) < 0 )
340 return 1; 340 return 1;
341 if ( SHIDWORD(pActor->pActorBuffs[16].uExpireTime) > 0 ) 341 if ( SHIDWORD(pActor->pActorBuffs[ACTOR_BUFF_STONESKIN].uExpireTime) > 0 )
342 return 0; 342 return 0;
343 v3 = 0; 343 v3 = 0;
344 v4 = LODWORD(pActor->pActorBuffs[16].uExpireTime) == 0; 344 v4 = LODWORD(pActor->pActorBuffs[ACTOR_BUFF_STONESKIN].uExpireTime) == 0;
345 } 345 }
346 case 46: 346 case 46:
347 { 347 {
348 if ( SHIDWORD(pActor->pActorBuffs[17].uExpireTime) < 0 ) 348 if ( SHIDWORD(pActor->pActorBuffs[17].uExpireTime) < 0 )
349 return 1; 349 return 1;
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[ACTOR_BUFF_SHIELD].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[ACTOR_BUFF_STONESKIN].uExpireTime > 0 && pActor->pActorBuffs[ACTOR_BUFF_STONESKIN].uPower > v6 )
412 v6 = pActor->pActorBuffs[16].uPower; 412 v6 = pActor->pActorBuffs[ACTOR_BUFF_STONESKIN].uPower;
413 v7 = v6 + v5; 413 v7 = v6 + v5;
414 if ( a3 ) 414 if ( a3 )
415 v8 = pPlayer->GetRangedAttack(); 415 v8 = pPlayer->GetRangedAttack();
416 else 416 else
417 v8 = pPlayer->GetActualAttack(false); 417 v8 = pPlayer->GetActualAttack(false);
466 a2a = 0; 466 a2a = 0;
467 if ( !v9 && (!(v9 | v8) || LODWORD(v5->pActorBuffs[ACTOR_BUFF_SOMETHING_THAT_HALVES_AC].uExpireTime) > 0) ) 467 if ( !v9 && (!(v9 | v8) || LODWORD(v5->pActorBuffs[ACTOR_BUFF_SOMETHING_THAT_HALVES_AC].uExpireTime) > 0) )
468 v6 /= 2; 468 v6 /= 2;
469 if ( (signed __int64)v5->pActorBuffs[ACTOR_BUFF_HOUR_OF_POWER].uExpireTime > 0 ) 469 if ( (signed __int64)v5->pActorBuffs[ACTOR_BUFF_HOUR_OF_POWER].uExpireTime > 0 )
470 v7 = v5->pActorBuffs[ACTOR_BUFF_HOUR_OF_POWER].uPower; 470 v7 = v5->pActorBuffs[ACTOR_BUFF_HOUR_OF_POWER].uPower;
471 if ( (signed __int64)v5->pActorBuffs[16].uExpireTime > 0 && v5->pActorBuffs[16].uPower > v7 ) 471 if ( (signed __int64)v5->pActorBuffs[ACTOR_BUFF_STONESKIN].uExpireTime > 0 && v5->pActorBuffs[ACTOR_BUFF_STONESKIN].uPower > v7 )
472 v7 = v5->pActorBuffs[16].uPower; 472 v7 = v5->pActorBuffs[ACTOR_BUFF_STONESKIN].uPower;
473 v10 = v7 + v6; 473 v10 = v7 + v6;
474 if ( (signed __int64)pActor->pActorBuffs[ACTOR_BUFF_HOUR_OF_POWER].uExpireTime > 0 ) 474 if ( (signed __int64)pActor->pActorBuffs[ACTOR_BUFF_HOUR_OF_POWER].uExpireTime > 0 )
475 a2a = pActor->pActorBuffs[ACTOR_BUFF_HOUR_OF_POWER].uPower; 475 a2a = pActor->pActorBuffs[ACTOR_BUFF_HOUR_OF_POWER].uPower;
476 if ( (signed __int64)pActor->pActorBuffs[17].uExpireTime > 0 && pActor->pActorBuffs[17].uPower > a2a ) 476 if ( (signed __int64)pActor->pActorBuffs[17].uExpireTime > 0 && pActor->pActorBuffs[17].uPower > a2a )
477 a2a = pActor->pActorBuffs[17].uPower; 477 a2a = pActor->pActorBuffs[17].uPower;