diff mm7_data.h @ 468:8822405efad2

Слияние
author Ritor1
date Mon, 25 Feb 2013 11:10:57 +0600
parents 5d2667144526 f7b91ef98ab2
children 0dbf780e247f
line wrap: on
line diff
--- a/mm7_data.h	Mon Feb 25 11:09:55 2013 +0600
+++ b/mm7_data.h	Mon Feb 25 11:10:57 2013 +0600
@@ -1000,17 +1000,17 @@
 extern const char *off_4F03B8[]; // idb
 //extern __int16 word_4F03FE[]; // weak
 //extern __int16 word_4F0400[]; // weak
-extern __int16 word_4F0404[];
-extern __int16 word_4F0498[]; // weak
+//extern __int16 word_4F0404[];
+//extern __int16 word_4F0498[]; // weak
 extern __int16 word_4F0576[]; // weak
-extern __int16 word_4F0578[]; // weak
-extern __int16 word_4F05AE[]; // weak
-extern char _4F063C_smthn_by_2da_uType[31]; // weak
-extern __int16 word_4F063E[290];
-extern __int16 word_4F06D8[22];
+
+//extern __int16 word_4F05AE[]; // weak
+extern char uItemsAmountPerShopType[]; // weak
+//extern __int16 word_4F063E[290];
+//extern __int16 word_4F06D8[22];
 extern __int16 word_4F0704[40];
 extern __int16 word_4F0754[49];
-extern __int16 word_4F07B6[88];
+//extern __int16 word_4F07B6[88];
 extern __int16 word_4F0866[14];
 extern __int16 _4F0882_evt_VAR_PlayerItemInHands_vals[54];
 extern int dword_4F08EC[]; // weak
@@ -2308,7 +2308,7 @@
 const char *__fastcall ContractSelectText(int pEventNumber);
 char __cdecl SimpleHouseAndBoatsDialog();
 struct GUIButton *__fastcall sub_4B36CC(int a1, unsigned int a2);
-int __thiscall sub_4B3703(void *_this);
+int sub_4B3703(int _this);
 int __thiscall sub_4B3A72(int a1); // idb
 int __fastcall sub_4B3AD4(signed int a1);
 int __fastcall sub_4B3B42(signed int a1);
@@ -2330,8 +2330,7 @@
 void __cdecl sub_4B7911();
 void __cdecl _4B7D7E_bank();
 void __cdecl TavernDialog();
-void *__cdecl GenerateShopItems();
-void sub_4B8F94();
+
 char *__cdecl WeaponShopDialog();
 POINT *__cdecl AlchemistDialog();
 void __cdecl ArmorShopDialog();
@@ -2342,7 +2341,7 @@
 void __cdecl ArenaFight();
 struct Texture *__cdecl sub_4BC8D5();
 struct GUIButton *__cdecl UI_CreateEndConversationButton();
-void __fastcall DrawLearnSkillDialog(signed int uMessageParam);
+void __fastcall sub_4BCACC_bounties(signed int a1);
 signed int __cdecl sub_4BD8B5();
 bool __fastcall sub_4BDAAF(ItemGen *a1, int _2da_idx);
 void __cdecl sub_4BDB56_buy_skill____();