Mercurial > mm7
comparison Actor.cpp @ 2059:f9698295c0bd
AttackerInfo, MerchandiseTest
author | Ritor1 |
---|---|
date | Sun, 01 Dec 2013 23:43:03 +0600 |
parents | b7485a6502f2 |
children | ee2724b9ca05 |
comparison
equal
deleted
inserted
replaced
2058:e249bd483311 | 2059:f9698295c0bd |
---|---|
2201 else | 2201 else |
2202 v18 = 16; | 2202 v18 = 16; |
2203 | 2203 |
2204 v7->uYawAngle = stru_5C6E00->Atan2( | 2204 v7->uYawAngle = stru_5C6E00->Atan2( |
2205 pParty->vPosition.x + (int)fixpoint_mul(stru_5C6E00->Cos(v18 + stru_5C6E00->uIntegerPi + v10->uYawAngle), v10->uDistanceXZ) - v7->vPosition.x, | 2205 pParty->vPosition.x + (int)fixpoint_mul(stru_5C6E00->Cos(v18 + stru_5C6E00->uIntegerPi + v10->uYawAngle), v10->uDistanceXZ) - v7->vPosition.x, |
2206 pParty->vPosition.y + (int)fixpoint_mul(stru_5C6E00->Sin(v18 + stru_5C6E00->uIntegerPi + v10->uYawAngle), v10->uDistanceXZ) - v7->vPosition.y); | 2206 pParty->vPosition.y + (int)fixpoint_mul(stru_5C6E00->Sin(v18 + stru_5C6E00->uIntegerPi + v10->uYawAngle), v10->uDistanceXZ) - v7->vPosition.y); |
2207 if ( uActionLength ) | 2207 if ( uActionLength ) |
2208 v7->uCurrentActionLength = uActionLength; | 2208 v7->uCurrentActionLength = uActionLength; |
2209 else | 2209 else |
2210 v7->uCurrentActionLength = 128; | 2210 v7->uCurrentActionLength = 128; |
2211 v7->uPitchAngle = LOWORD(v10->uPitchAngle); | 2211 v7->uPitchAngle = LOWORD(v10->uPitchAngle); |
3095 continue; | 3095 continue; |
3096 } | 3096 } |
3097 else if ( pActor->uAIState == AttackingMelee ) | 3097 else if ( pActor->uAIState == AttackingMelee ) |
3098 { | 3098 { |
3099 v35 = pActor->special_ability_use_check(actor_id); | 3099 v35 = pActor->special_ability_use_check(actor_id); |
3100 AgressorAtackInfo.Add( | 3100 AttackerInfo.Add( |
3101 a1, | 3101 a1, |
3102 5120, | 3102 5120, |
3103 pActor->vPosition.x, | 3103 pActor->vPosition.x, |
3104 pActor->vPosition.y, | 3104 pActor->vPosition.y, |
3105 pActor->vPosition.z + ((signed int)pActor->uActorHeight >> 1), | 3105 pActor->vPosition.z + ((signed int)pActor->uActorHeight >> 1), |