Mercurial > mm7
diff mm7_data.h @ 252:e22e2357c8b3
Merge
| author | Gloval |
|---|---|
| date | Mon, 18 Feb 2013 08:59:34 +0400 |
| parents | 48f21f569328 37dcbe8f3cca |
| children | 96f3a1177b37 |
line wrap: on
line diff
--- a/mm7_data.h Mon Feb 18 08:47:21 2013 +0400 +++ b/mm7_data.h Mon Feb 18 08:59:34 2013 +0400 @@ -1702,7 +1702,7 @@ extern int dword_F8B1E0; // weak extern int dword_F8B1E4; // weak extern const char *ptr_F8B1E8; // idb -extern char byte_F8B1EC; // weak +extern char dialogue_show_profession_details; // weak extern char byte_F8B1EF[]; // weak extern char byte_F8B1F0[4]; extern int dword_F8B1F4; // weak @@ -2183,7 +2183,7 @@ bool __fastcall sub_4759C9(BLVFace *a1, int a2, int a3, __int16 a4); bool __fastcall sub_475D85(Vec3_int_ *a1, Vec3_int_ *a2, int *a3, BLVFace *a4); bool __fastcall sub_475F30(int *a1, BLVFace *a2, int a3, int a4, int a5, int a6, int a7, int a8, int a9); - +bool PartyHasDragon(); int __fastcall const_1(int, int); // weak int __cdecl GetPartyReputation(); @@ -2344,7 +2344,6 @@ void __cdecl sub_4BBCDD(); void __fastcall _4BBF61_summon_actor(int a1, __int16 x, int y, int z); // idb void __cdecl ArenaFight(); -void __thiscall sub_4BC49B(unsigned int _this); struct Texture *__cdecl sub_4BC8D5(); struct GUIButton *__cdecl sub_4BCA33(); void __fastcall sub_4BCACC_bounties(signed int a1);