# HG changeset patch
# User Grumpy7
# Date 1397071845 -7200
# Node ID 7ebc07cd6c537af0c2497e408dddb0039daade1c
# Parent  4100fb5c4913430bf2fa3040befafc92528ba208
Adding GUIButton.h

diff -r 4100fb5c4913 -r 7ebc07cd6c53 Build/Visual Studio 2012/World of Might and Magic.vcxproj.filters
--- a/Build/Visual Studio 2012/World of Might and Magic.vcxproj.filters	Wed Apr 09 21:22:06 2014 +0200
+++ b/Build/Visual Studio 2012/World of Might and Magic.vcxproj.filters	Wed Apr 09 21:30:45 2014 +0200
@@ -959,6 +959,7 @@
     <ClInclude Include="..\..\UI\Books\UIMapBook.h">
       <Filter>UI\Books</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\GUIButton.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\Player.swig" />
diff -r 4100fb5c4913 -r 7ebc07cd6c53 GUIButton.cpp
--- a/GUIButton.cpp	Wed Apr 09 21:22:06 2014 +0200
+++ b/GUIButton.cpp	Wed Apr 09 21:30:45 2014 +0200
@@ -1,4 +1,5 @@
 #define _CRT_SECURE_NO_WARNINGS
+#include "GUIButton.h"
 #include "GUIWindow.h"
 #include "GUIFont.h"
 
diff -r 4100fb5c4913 -r 7ebc07cd6c53 GUIButton.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/GUIButton.h	Wed Apr 09 21:30:45 2014 +0200
@@ -0,0 +1,2 @@
+
+void CreateButtonInColumn(int a1, unsigned int a2);
\ No newline at end of file
diff -r 4100fb5c4913 -r 7ebc07cd6c53 Indoor.h
--- a/Indoor.h	Wed Apr 09 21:22:06 2014 +0200
+++ b/Indoor.h	Wed Apr 09 21:30:45 2014 +0200
@@ -555,3 +555,4 @@
 void Door_switch_animation(unsigned int uDoorID, int a2); // idb: sub_449A49
 int __fastcall sub_4088E9(int a1, int a2, int a3, int a4, int a5, int a6);
 void __fastcall PrepareDrawLists_BLV();
+void PrepareToLoadBLV(unsigned int bLoading);
diff -r 4100fb5c4913 -r 7ebc07cd6c53 Items.cpp
--- a/Items.cpp	Wed Apr 09 21:22:06 2014 +0200
+++ b/Items.cpp	Wed Apr 09 21:30:45 2014 +0200
@@ -1,6 +1,7 @@
 #define _CRT_SECURE_NO_WARNINGS
 #include <stdlib.h>
 #include <string>
+#include "GUIButton.h"
 #include "mm7_unsorted_subs.h"
 #include "ErrorHandling.h"
 
diff -r 4100fb5c4913 -r 7ebc07cd6c53 UI/Books/UIMapBook.cpp
--- a/UI/Books/UIMapBook.cpp	Wed Apr 09 21:22:06 2014 +0200
+++ b/UI/Books/UIMapBook.cpp	Wed Apr 09 21:30:45 2014 +0200
@@ -1,4 +1,5 @@
 #define _CRT_SECURE_NO_WARNINGS
+#include "UIMapBook.h"
 #include "..\..\Events.h"
 #include "..\..\mm7_unsorted_subs.h"
 #include "..\..\MM7.h"
diff -r 4100fb5c4913 -r 7ebc07cd6c53 UI/Books/UIMapBook.h
--- a/UI/Books/UIMapBook.h	Wed Apr 09 21:22:06 2014 +0200
+++ b/UI/Books/UIMapBook.h	Wed Apr 09 21:30:45 2014 +0200
@@ -0,0 +1,3 @@
+
+void DrawBook_Map_sub(unsigned int tl_x, unsigned int tl_y, unsigned int br_x, int br_y, int _48074); // idb
+const char *GetMapBookHintText();//sub_444564
\ No newline at end of file
diff -r 4100fb5c4913 -r 7ebc07cd6c53 UI/UIHouses.cpp
--- a/UI/UIHouses.cpp	Wed Apr 09 21:22:06 2014 +0200
+++ b/UI/UIHouses.cpp	Wed Apr 09 21:30:45 2014 +0200
@@ -1,4 +1,5 @@
 #define _CRT_SECURE_NO_WARNINGS
+#include "..\GUIButton.h"
 #include "..\mm7_unsorted_subs.h"
 #include "..\SaveLoad.h"
 #include "..\Texture.h"
diff -r 4100fb5c4913 -r 7ebc07cd6c53 UI/UIHouses.h
--- a/UI/UIHouses.h	Wed Apr 09 21:22:06 2014 +0200
+++ b/UI/UIHouses.h	Wed Apr 09 21:30:45 2014 +0200
@@ -133,6 +133,7 @@
 void  WeaponShopDialog();
 void  AlchemistDialog();
 void  ArmorShopDialog();
+void SimpleHouseDialog();
 
 
 void InitializaDialogueOptions_Tavern(BuildingType type); // idb
diff -r 4100fb5c4913 -r 7ebc07cd6c53 UI/UIPopup.cpp
--- a/UI/UIPopup.cpp	Wed Apr 09 21:22:06 2014 +0200
+++ b/UI/UIPopup.cpp	Wed Apr 09 21:30:45 2014 +0200
@@ -1,4 +1,5 @@
 #define _CRT_SECURE_NO_WARNINGS
+#include "Books\UIMapBook.h"
 #include "..\MM7.h"
 #include "..\mm7_unsorted_subs.h"
 
diff -r 4100fb5c4913 -r 7ebc07cd6c53 mm7_unsorted_subs.h
--- a/mm7_unsorted_subs.h	Wed Apr 09 21:22:06 2014 +0200
+++ b/mm7_unsorted_subs.h	Wed Apr 09 21:30:45 2014 +0200
@@ -29,18 +29,15 @@
 int __fastcall _43F5C8_get_point_light_level_with_respect_to_lights(unsigned int uBaseLightLevel, int uSectorID, float x, float y, float z);
 bool _44100D_should_alter_right_panel();
 __int16 __fastcall sub_441A4E(int a1);
-void DrawBook_Map_sub(unsigned int tl_x, unsigned int tl_y, unsigned int br_x, int br_y, int _48074); // idb
 void Initialize2DA();
 void LoadLevel_InitializeLevelStr();
 void OnMapLeave();
 void OnMapLoad();
 void Level_LoadEvtAndStr(const char *pLevelName);
-const char *GetMapBookHintText();//sub_444564
 int GetTravelTime();
 void __fastcall sub_4451A8_press_any_key(int a1, int a2, int a4);
 unsigned int SkillToMastery(unsigned int skill_value);
 unsigned int __fastcall GetSpellColor(signed int a1);
-void PrepareToLoadBLV(unsigned int bLoading);
 void __fastcall PrepareToLoadODM(unsigned int bLoading, struct ODMRenderParams *a2);
 void _461103_load_level_sub();
 void MainMenu_Loop();
@@ -62,8 +59,6 @@
 enum MENU_STATE GetCurrentMenuID();
 void OracleDialogue();
 const char * _4B254D_SkillMasteryTeacher(int trainerInfo);
-void SimpleHouseDialog();
-void CreateButtonInColumn(int a1, unsigned int a2);
 void sub_4B3E1E();
 void DrawJoinGuildWindow(int pEventCode);
 void _4B3FE5_training_dialogue(int a4);