Mercurial > mm7

diff mm7_data.h @ 2059:f9698295c0bd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
AttackerInfo, MerchandiseTest
author Ritor1
date Sun, 01 Dec 2013 23:43:03 +0600
parents b7485a6502f2
children 72177f3603da
line wrap: on
line diff
--- a/mm7_data.h	Sun Dec 01 20:14:32 2013 +0600
+++ b/mm7_data.h	Sun Dec 01 23:43:03 2013 +0600
@@ -1111,7 +1111,7 @@
 double __fastcall sub_43AE12(signed int a1);
 int __fastcall _43AFE3_calc_spell_damage(int a1, int a2, signed int a3, int a4);
 void __fastcall sub_43B057(unsigned int uObjID, unsigned int uActorID, struct Vec3_int_ *pVelocity);
-void ActorDamageFromMonster(signed int agressor_id, unsigned int actor_id, struct Vec3_int_ *pVelocity, signed int a4);
+void ActorDamageFromMonster(signed int attacker_id, unsigned int actor_id, struct Vec3_int_ *pVelocity, signed int a4);
 void CharacterUI_LoadPaperdollTextures();
 int __fastcall GetItemTextureFilename(char *pOut, signed int item_id, int index, int shoulder);
 bool IsDwarfPresentInParty(bool b);
@@ -1202,7 +1202,7 @@
 void UI_CreateEndConversationButton();
 void __fastcall OnSelectShopDialogueOption(signed int uMessageParam);
 int HouseDialogPressCloseBtn();
-bool __fastcall MerchandiseTest(ItemGen *item, int _2da_idx);
+bool MerchandiseTest(ItemGen *item, int _2da_idx);
 void UIShop_Buy_Identify_Repair();
 bool __fastcall IsBModelVisible(unsigned int uModelID, int *unused);
 void ODM_LoadAndInitialize(const char *pLevelFilename, struct ODMRenderParams *thisa);