Mercurial > mm7
changeset 2349:7ebc07cd6c53
Adding GUIButton.h
| author | Grumpy7 |
|---|---|
| date | Wed, 09 Apr 2014 21:30:45 +0200 |
| parents | 4100fb5c4913 |
| children | 7c10dfb6d802 |
| files | Build/Visual Studio 2012/World of Might and Magic.vcxproj.filters GUIButton.cpp GUIButton.h Indoor.h Items.cpp UI/Books/UIMapBook.cpp UI/Books/UIMapBook.h UI/UIHouses.cpp UI/UIHouses.h UI/UIPopup.cpp mm7_unsorted_subs.h |
| diffstat | 11 files changed, 13 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- 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" />
--- 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"
--- /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
--- 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);
--- 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"
--- 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"
--- 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
--- 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"
--- 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
--- 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"
--- 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);