Mercurial > mm7

comparison TurnEngine.cpp @ 1972:3ef25d06b9b0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Actor::special_ability_use_check moved to Actor and cleaned up
author Grumpy7
date Sat, 26 Oct 2013 00:18:52 -0700
parents 524fe0810f32
children 28cb79ae2f6f
comparison
equal deleted inserted replaced
1971:e45c277da9f1 1972:3ef25d06b9b0
725 if ( (signed int)v5->uCurrentActionTime >= v5->uCurrentActionLength ) 725 if ( (signed int)v5->uCurrentActionTime >= v5->uCurrentActionLength )
726 { 726 {
727 switch (v3) 727 switch (v3)
728 { 728 {
729 case AIState::AttackingMelee: 729 case AIState::AttackingMelee:
730 v19 = stru_50C198.special_ability_use_check(&pActors[v4], v4); 730 v19 = pActors[v4].special_ability_use_check(v4);
731 stru_50FE08.Add( v28->uPackedID, 5120, v5->vPosition.x, v5->vPosition.y, v5->vPosition.z + ((signed int)v5->uActorHeight >> 1), v19, 1); 731 stru_50FE08.Add( v28->uPackedID, 5120, v5->vPosition.x, v5->vPosition.y, v5->vPosition.z + ((signed int)v5->uActorHeight >> 1), v19, 1);
732 Actor::AI_Stand(v4, a2a, 0, &a4); 732 Actor::AI_Stand(v4, a2a, 0, &a4);
733 break; 733 break;
734 case AIState::AttackingRanged1: 734 case AIState::AttackingRanged1:
735 Actor::AI_RangedAttack(v4, &a4, v5->pMonsterInfo.uMissleAttack1Type, 0); 735 Actor::AI_RangedAttack(v4, &a4, v5->pMonsterInfo.uMissleAttack1Type, 0);
846 break; 846 break;
847 } 847 }
848 848
849 if ( v5->pMonsterInfo.uHostilityType == 4 && v22 && (signed int)v9 < 5120 ) 849 if ( v5->pMonsterInfo.uHostilityType == 4 && v22 && (signed int)v9 < 5120 )
850 { 850 {
851 v14 = stru_50C198.special_ability_use_check(v5, actor_id); 851 v14 = v5->special_ability_use_check(actor_id);
852 v21->AI_action_type = TE_AI_STAND; 852 v21->AI_action_type = TE_AI_STAND;
853 switch (v14) 853 switch (v14)
854 { 854 {
855 case 1: 855 case 1:
856 if ( v5->pMonsterInfo.uMissleAttack2Type ) 856 if ( v5->pMonsterInfo.uMissleAttack2Type )