Mercurial > mm7

comparison mm7_3.cpp @ 861:fea81e031484

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
more AI function renames
author zipi
date Sun, 31 Mar 2013 12:49:45 +0100
parents 8fc2f035abc0
children f4394e320312
comparison
equal deleted inserted replaced
860:8fc2f035abc0 861:fea81e031484
15195 v5->sCurrentHP = v7; 15195 v5->sCurrentHP = v7;
15196 if ( v6 ) 15196 if ( v6 )
15197 { 15197 {
15198 if ( v7 >= 0 ) 15198 if ( v7 >= 0 )
15199 { 15199 {
15200 Actor::_4030AD(v84, 4, 0); 15200 Actor::Stun(v84, 4, 0);
15201 } 15201 }
15202 else 15202 else
15203 { 15203 {
15204 Actor::Die(v84); 15204 Actor::Die(v84);
15205 if ( v5->pMonsterInfo.uExp ) 15205 if ( v5->pMonsterInfo.uExp )
15545 { 15545 {
15546 if ( v21->pMonsterInfo.uMissleAttack1Type ) 15546 if ( v21->pMonsterInfo.uMissleAttack1Type )
15547 { 15547 {
15548 if ( (signed int)v21->pMonsterInfo.uRecoveryTime <= 0 ) 15548 if ( (signed int)v21->pMonsterInfo.uRecoveryTime <= 0 )
15549 { 15549 {
15550 Actor::_403476(actor_id, target_pid, &pDir); 15550 Actor::MissileAttack1(actor_id, target_pid, &pDir);
15551 } 15551 }
15552 else if ( v21->pMonsterInfo.uMovementType == 5 ) 15552 else if ( v21->pMonsterInfo.uMovementType == 5 )
15553 { 15553 {
15554 v47 = (double)(signed int)v21->pMonsterInfo.uRecoveryTime * 2.133333333333333; 15554 v47 = (double)(signed int)v21->pMonsterInfo.uRecoveryTime * 2.133333333333333;
15555 v64 = (signed __int64)v47; 15555 v64 = (signed __int64)v47;
15608 Actor::AI_Stand(actor_id, target_pid, v64, &pDir); 15608 Actor::AI_Stand(actor_id, target_pid, v64, &pDir);
15609 } 15609 }
15610 else 15610 else
15611 { 15611 {
15612 //monsters 15612 //monsters
15613 Actor::_403C6C(actor_id, target_pid, &pDir); 15613 Actor::MeleeAttack(actor_id, target_pid, &pDir);
15614 } 15614 }
15615 } 15615 }
15616 continue; 15616 continue;
15617 } 15617 }
15618 else if ( v45 == 2 || v45 == 3 ) 15618 else if ( v45 == 2 || v45 == 3 )
15624 if ( v46 ) 15624 if ( v46 )
15625 { 15625 {
15626 if ( (signed int)v21->pMonsterInfo.uRecoveryTime <= 0 ) 15626 if ( (signed int)v21->pMonsterInfo.uRecoveryTime <= 0 )
15627 { 15627 {
15628 if ( v45 == 2 ) 15628 if ( v45 == 2 )
15629 Actor::_403854(actor_id, target_pid, &pDir); 15629 Actor::SpellAttack1(actor_id, target_pid, &pDir);
15630 else 15630 else
15631 Actor::_403A60(actor_id, target_pid, &pDir); 15631 Actor::SpellAttack2(actor_id, target_pid, &pDir);
15632 } 15632 }
15633 else if ( v80 * 307.2 > (double)v81 || v21->pMonsterInfo.uMovementType == 5 ) 15633 else if ( v80 * 307.2 > (double)v81 || v21->pMonsterInfo.uMovementType == 5 )
15634 { 15634 {
15635 v47 = (double)(signed int)v21->pMonsterInfo.uRecoveryTime * 2.133333333333333; 15635 v47 = (double)(signed int)v21->pMonsterInfo.uRecoveryTime * 2.133333333333333;
15636 v64 = (signed __int64)v47; 15636 v64 = (signed __int64)v47;
15678 v64 = (signed __int64)v47; 15678 v64 = (signed __int64)v47;
15679 Actor::AI_Stand(actor_id, target_pid, v64, &pDir); 15679 Actor::AI_Stand(actor_id, target_pid, v64, &pDir);
15680 } 15680 }
15681 else 15681 else
15682 { 15682 {
15683 Actor::_403C6C(actor_id, target_pid, &pDir); 15683 Actor::MeleeAttack(actor_id, target_pid, &pDir);
15684 } 15684 }
15685 } 15685 }
15686 continue; 15686 continue;
15687 } 15687 }
15688 } 15688 }
15752 v64 = (signed __int64)v47; 15752 v64 = (signed __int64)v47;
15753 Actor::AI_Stand(actor_id, target_pid, v64, &pDir); 15753 Actor::AI_Stand(actor_id, target_pid, v64, &pDir);
15754 } 15754 }
15755 else 15755 else
15756 { 15756 {
15757 Actor::_403C6C(actor_id, target_pid, &pDir); 15757 Actor::MeleeAttack(actor_id, target_pid, &pDir);
15758 } 15758 }
15759 } 15759 }
15760 else if ( (signed int)v21->pMonsterInfo.uRecoveryTime > 0 ) 15760 else if ( (signed int)v21->pMonsterInfo.uRecoveryTime > 0 )
15761 { 15761 {
15762 v47 = (double)(signed int)v21->pMonsterInfo.uRecoveryTime * 2.133333333333333; 15762 v47 = (double)(signed int)v21->pMonsterInfo.uRecoveryTime * 2.133333333333333;
15770 Actor::Pursue1(actor_id, target_pid, actor_id, (signed __int64)v47, &pDir); 15770 Actor::Pursue1(actor_id, target_pid, actor_id, (signed __int64)v47, &pDir);
15771 } 15771 }
15772 } 15772 }
15773 else 15773 else
15774 { 15774 {
15775 Actor::_40368B(actor_id, target_pid, &pDir); 15775 Actor::MissileAttack2(actor_id, target_pid, &pDir);
15776 } 15776 }
15777 } 15777 }
15778 } 15778 }
15779 } 15779 }
15780 15780