Mercurial > mm7

diff Actor.h @ 322:ce39b96acf5c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Killing friendly peasants subs
author Nomad
date Wed, 20 Feb 2013 04:36:14 +0200
parents 5a66be213cff
children 747933903b1c
line wrap: on
line diff
--- a/Actor.h	Wed Feb 20 03:35:22 2013 +0200
+++ b/Actor.h	Wed Feb 20 04:36:14 2013 +0200
@@ -190,49 +190,49 @@
   void Reset();
   void Remove();
   void PrepareSprites(char load_sounds_if_bit1_set);
-  unsigned int UpdateAnimation();
+  void UpdateAnimation();
   signed int GetActorsRelation(Actor *a2);
   void SetRandomGoldIfTheresNoItem();
   bool CanAct();
   bool IsNotAlive();
   void InitializeDialogue(int bPlayerSaysHello);
-  char _438B9B();
+  bool IsPeasant();
 
   
-  static void __fastcall _401221(unsigned int uActorID, int *a2, unsigned int a3);
-  static unsigned int __fastcall _402686(unsigned int uActorID, unsigned int a2, signed int uActionLength, struct AIDirection *a4);
-  static int __fastcall _40281C(unsigned int uActorID, unsigned int a2, signed int uActionLength, struct AIDirection *pDir, int a5);
-  static unsigned int __fastcall _402968(unsigned int uActorID, signed int edx0, int uActionLength, struct AIDirection *a4);
-  static unsigned int __fastcall _402AD7(unsigned int uActorID, unsigned int a2, signed int arg0, signed int uActionLength, struct AIDirection *pDir);
-  static void __fastcall PlaySound(unsigned int uActorID, unsigned int uSoundID);
+  static void _401221(unsigned int uActorID, int *a2, unsigned int a3);
+  static void _402686(unsigned int uActorID, unsigned int a2, signed int uActionLength, struct AIDirection *a4);
+  static void _40281C(unsigned int uActorID, unsigned int a2, signed int uActionLength, struct AIDirection *pDir, int a5);
+  static void _402968(unsigned int uActorID, signed int edx0, int uActionLength, struct AIDirection *a4);
+  static void _402AD7(unsigned int uActorID, unsigned int a2, signed int arg0, signed int uActionLength, struct AIDirection *pDir);
+  static void PlaySound(unsigned int uActorID, unsigned int uSoundID);
   static void Die(unsigned int uActorID);
-  static unsigned int __fastcall Resurrect(unsigned int uActorID);
-  static int __fastcall _402F87(unsigned int uActorID, unsigned int uObjID, struct AIDirection *a4);
-  static __int16 __fastcall _4030AD(unsigned int uActorID, signed int edx0, int arg0);
+  static void Resurrect(unsigned int uActorID);
+  static void _402F87(unsigned int uActorID, unsigned int uObjID, struct AIDirection *a4);
+  static void _4030AD(unsigned int uActorID, signed int edx0, int arg0);
   static char __fastcall _4031C1_update_job(unsigned int uActorID, signed int a2, int a3);
-  static void __fastcall _4032B2(unsigned int a1, unsigned int a2, int a3, int uActionLength);
-  static unsigned int __fastcall _403476(unsigned int uActorID, signed int edx0, struct AIDirection *pDir);
-  static unsigned int __fastcall _40368B(unsigned int uActorID, signed int edx0, struct AIDirection *pDir);
-  static unsigned int __fastcall _403854(unsigned int uActorID, signed int edx0, struct AIDirection *pDir);
-  static unsigned int __fastcall _403A60(unsigned int uActorID, signed int edx0, struct AIDirection *pDir);
-  static unsigned int __fastcall _403C6C(unsigned int uActorID, signed int edx0, struct AIDirection *arg0);
+  static void _4032B2(unsigned int a1, unsigned int a2, int a3, int uActionLength);
+  static void _403476(unsigned int uActorID, signed int edx0, struct AIDirection *pDir);
+  static void _40368B(unsigned int uActorID, signed int edx0, struct AIDirection *pDir);
+  static void _403854(unsigned int uActorID, signed int edx0, struct AIDirection *pDir);
+  static void _403A60(unsigned int uActorID, signed int edx0, struct AIDirection *pDir);
+  static void _403C6C(unsigned int uActorID, signed int edx0, struct AIDirection *arg0);
   static void __fastcall StandAwhile(unsigned int uActorID);
-  static unsigned int __fastcall _403EB6(unsigned int uActorID, unsigned int a2, unsigned int uActionLength, struct AIDirection *a4);
-  static unsigned int __fastcall _403F58(unsigned int uActorID, signed int uObjID, int uActionLength, struct AIDirection *a4);
-  static unsigned int __fastcall FaceObject(unsigned int uActorID, unsigned int uObjID, int _48, struct AIDirection *a4);
+  static void _403EB6(unsigned int uActorID, unsigned int a2, unsigned int uActionLength, struct AIDirection *a4);
+  static void _403F58(unsigned int uActorID, signed int uObjID, int uActionLength, struct AIDirection *a4);
+  static void 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 _404874(unsigned int uActorID, struct AIDirection *a2, int a3, char a4);
   static void __fastcall _404AC7(unsigned int uActorID, struct AIDirection *pDir, int spellnum, int a4, unsigned int uSkillLevel);
-  static void _43AC45(unsigned int uActorID, int a2);
-  static bool _43ABB0(Actor *a1, Actor *a2);
+  static void AggroSurroundingPeasants(unsigned int uActorID, int a2);
+  static bool ArePeasantsOfSameFaction(Actor *a1, Actor *a2);
   static bool StealFrom(unsigned int uActorID);
   static void GiveItem(unsigned int uActorID, unsigned int uItemID, unsigned int bGive);
   static void ToggleFlag(signed int uActorID, unsigned int uFlag, int bToggle);
-  static void _438CF3(unsigned int uActorID);
+  static void ApplyFineForKillingPeasant(unsigned int uActorID);
   static void DrawHealthBar(Actor *a1, struct GUIWindow *a2);
   static int _43B3E0_CalcDamage(Actor *a1, signed int a2);
-  static int AddBloodsplatOnDamageOverlay(unsigned int uActorID, int a2, signed int a3);
+  static void AddBloodsplatOnDamageOverlay(unsigned int uActorID, int a2, signed int a3);
 
 
   char pActorName[32];