Mercurial > mm7

diff mm7_data.h @ 474:442afd6c34a4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Gloval
date Tue, 26 Feb 2013 07:40:26 +0400
parents 7f1b00901cf7
children 77430756f06a
line wrap: on
line diff
--- a/mm7_data.h	Tue Feb 26 05:00:40 2013 +0200
+++ b/mm7_data.h	Tue Feb 26 07:40:26 2013 +0400
@@ -1686,7 +1686,7 @@
 extern __int16 word_F8B158[]; // weak
 extern struct Texture *dword_F8B164; // idb
 extern struct Texture *ItemsInShopTexture[12];
-extern int dword_F8B198; // weak
+extern int in_current_bilding_type; // weak
 extern int dword_F8B19C; // weak
 extern __int16 word_F8B1A0; // weak
 extern const char *dword_F8B1A4; // idb
@@ -2307,11 +2307,11 @@
 char *__thiscall _4B254D_SkillMasteryTeacher(int _this);
 const char *__fastcall ContractSelectText(int pEventNumber);
 char __cdecl SimpleHouseAndBoatsDialog();
-struct GUIButton *__fastcall sub_4B36CC(int a1, unsigned int a2);
-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);
+void  CreateButtonInColumn(int a1, unsigned int a2);
+void FillAviableSkillsToTeach(int _this);
+void  sub_4B3A72(int a1); // idb
+void sub_4B3AD4(signed int a1);
+void sub_4B3B42(signed int a1);
 void __cdecl sub_4B3E1E();
 void __fastcall DrawJoinGuildWindow(int pEventNumber);
 void __fastcall sub_4B3FE5(int a4);