Mercurial > mm7

comparison mm7_6.cpp @ 1685:2a309997c42f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Player::StealFromShop started cleanup, fixing a few errors caused by not commiting everything
author Grumpy7
date Sat, 21 Sep 2013 12:38:43 +0200
parents 2c71fa8913d2
children 8251e59fd7c1
comparison
equal deleted inserted replaced
1684:f84b8b2a875c 1685:2a309997c42f
765 v6 = pActor->pActorBuffs[16].uPower; 765 v6 = pActor->pActorBuffs[16].uPower;
766 v7 = v6 + v5; 766 v7 = v6 + v5;
767 if ( a3 ) 767 if ( a3 )
768 v8 = pPlayer->GetRangedAttack(); 768 v8 = pPlayer->GetRangedAttack();
769 else 769 else
770 v8 = pPlayer->GetActualAttack(0); 770 v8 = pPlayer->GetActualAttack(false);
771 v9 = rand() % (v7 + 2 * v8 + 30); 771 v9 = rand() % (v7 + 2 * v8 + 30);
772 if ( a3 == 2 ) 772 if ( a3 == 2 )
773 { 773 {
774 v14 = a4 + v9; 774 v14 = a4 + v9;
775 v15 = ((v7 + 15) >> 1) + v7 + 15; 775 v15 = ((v7 + 15) >> 1) + v7 + 15;