diff mm7_data.h @ 502:dd5124185551

Слияние
author Ritor1
date Fri, 01 Mar 2013 17:38:04 +0600
parents 6fa3ff8ef729 0e20e886365d
children 3ee1e351e710
line wrap: on
line diff
--- a/mm7_data.h	Fri Mar 01 17:37:47 2013 +0600
+++ b/mm7_data.h	Fri Mar 01 17:38:04 2013 +0600
@@ -1008,7 +1008,7 @@
 extern char uItemsAmountPerShopType[]; // weak
 //extern __int16 word_4F063E[290];
 //extern __int16 word_4F06D8[22];
-extern int word_4F0704[32];
+extern int guild_mambership_flags[32];
 extern __int16 word_4F0754[49];
 //extern __int16 word_4F07B6[88];
 extern __int16 word_4F0866[14];
@@ -1022,7 +1022,7 @@
 extern char _4F0D38_TravelInfo[]; // weak
 extern int dword_4F0E10[32];
 extern Vec2_int_ pMonsterArenaPlacements[20];
-extern __int16 word_4F0F30[]; // weak
+extern __int16 word_4F0F30[32]; // weak
 extern char aS03d[]; // idb
 extern char byte_4F0F98; // idb
 extern char sz[]; // idb
@@ -1684,7 +1684,7 @@
 extern int dword_F8B144; // idb
 extern char byte_F8B148[16];
 extern __int16 word_F8B158[]; // weak
-extern struct Texture *dword_F8B164; // idb
+extern struct Texture *ShopTexture; // idb
 extern struct Texture *ItemsInShopTexture[12];
 extern int in_current_building_type; // weak
 extern int dword_F8B19C; // weak
@@ -2322,11 +2322,11 @@
 int __cdecl TrainingDialog();
 char *__cdecl JailDialog();
 int __cdecl MagicShopDialog();
-int __cdecl GuildDialog();
+void  GuildDialog();
 int __cdecl sub_4B6478();
 bool __fastcall sub_4B68EA(int a1);
 void __cdecl TravelByTransport();
-int __cdecl TampleDialog();
+void TempleDialog();
 void __cdecl TownHallDialog();
 void __cdecl BankDialog();
 void __cdecl TavernDialog();
@@ -2339,7 +2339,7 @@
 void __cdecl sub_4BBCDD();
 void __fastcall _4BBF61_summon_actor(int a1, __int16 x, int y, int z); // idb
 void __cdecl ArenaFight();
-struct Texture *__cdecl sub_4BC8D5();
+void  SpellBookGenerator();
 struct GUIButton *__cdecl UI_CreateEndConversationButton();
 void __fastcall DrawLearnSkillDialog(signed int uMessageParam);
 signed int __cdecl sub_4BD8B5();