Mercurial > mm7
diff Actor.h @ 2313:b75a8f15568d
Слияние
author | Ritor1 |
---|---|
date | Tue, 18 Mar 2014 17:34:33 +0600 |
parents | 43af6c819e88 |
children | 1e865e8690ba |
line wrap: on
line diff
--- a/Actor.h Tue Mar 18 17:34:26 2014 +0600 +++ b/Actor.h Tue Mar 18 17:34:33 2014 +0600 @@ -213,6 +213,7 @@ static void Explode(unsigned int uActorID); static void AI_RangedAttack(unsigned int uActorID, struct AIDirection *a2, int type, char a4); static void AI_SpellAttack(unsigned int uActorID, struct AIDirection *pDir, int uSpellID, int a4, unsigned int uSkillLevel); + static void ActorDamageFromMonster(signed int attacker_id, unsigned int actor_id, struct Vec3_int_ *pVelocity, signed int a4); static unsigned short GetObjDescId( int spellId );