Mercurial > mm7

diff Actor.h @ 1867:eb580660bbbb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Nomad
date Wed, 16 Oct 2013 13:34:49 +0200
parents b6258f64e313
children 1d9e4b50bc7c
line wrap: on
line diff
--- a/Actor.h	Wed Oct 16 13:34:26 2013 +0200
+++ b/Actor.h	Wed Oct 16 13:34:49 2013 +0200
@@ -227,10 +227,13 @@
   static void AI_Stand(unsigned int uActorID, unsigned int object_to_face_pid, unsigned int uActionLength, struct AIDirection *a4);
   static void AI_StandOrBored(unsigned int uActorID, signed int uObjID, int uActionLength, struct AIDirection *a4);
   static void AI_FaceObject(unsigned int uActorID, unsigned int uObjID, int _48, struct AIDirection *a4);
-  static struct AIDirection *__fastcall GetDirectionInfo(unsigned int uObj1ID, unsigned int uObj2ID, struct AIDirection *pOut, int a4);
-  static signed int __fastcall Explode(unsigned int uActorID);
-  static char __fastcall AI_RangedAttack(unsigned int uActorID, struct AIDirection *a2, int type, char a4);
-  static void __fastcall AI_SpellAttack(unsigned int uActorID, struct AIDirection *pDir, int uSpellID, int a4, unsigned int uSkillLevel);
+  static struct AIDirection * GetDirectionInfo(unsigned int uObj1ID, unsigned int uObj2ID, struct AIDirection *pOut, int a4);
+  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 unsigned short GetObjDescId( int spellId );
+
   static void AggroSurroundingPeasants(unsigned int uActorID, int a2);
   static bool ArePeasantsOfSameFaction(Actor *a1, Actor *a2);
   static bool StealFrom(unsigned int uActorID);