diff GUI/GUIWindow.h @ 2548:87e5590d034b

All Books windows are refactored into respective classes
author a.parshin
date Tue, 12 May 2015 03:24:19 +0200
parents fed97f15d1e1
children 3121fb54a110
line wrap: on
line diff
--- a/GUI/GUIWindow.h	Tue May 12 01:45:31 2015 +0200
+++ b/GUI/GUIWindow.h	Tue May 12 03:24:19 2015 +0200
@@ -300,7 +300,7 @@
   WINDOW_CloseRestWindowBtn  = 96,
   WINDOW_ExitCharacterWindow = 97, // OnCancel2
   WINDOW_RestWindow          = 0x62,
-  WINDOW_BooksWindow         = 99,
+  WINDOW_BooksButtonOverlay         = 99,
   WINDOW_CharacterWindow_Stats     = 0x64,
   WINDOW_CharacterWindow_Skills    = 0x65,
   WINDOW_CharacterWindow_Awards    = 0x66,
@@ -343,7 +343,6 @@
   void DrawShops_next_generation_time_string(__int64 next_generation_time);
   void HouseDialogManager();
   void OpenSpellBook();
-  void InitializeBookView();
   void DrawMessageBox(int arg0);
   GUIButton *GetControl(unsigned int uID);
   void _41D08F_set_keyboard_control_group(int num_buttons, int a3, int a4, int a5);
@@ -380,24 +379,13 @@
 #pragma pack(pop)
 
 
-struct GUIWindow_Book : public GUIWindow
+
+struct GUIWindow_BooksButtonOverlay : public GUIWindow
 {
-    GUIWindow_Book(unsigned int x, unsigned int y, unsigned int width, unsigned int height, int button, const char *hint) :
-        GUIWindow(x, y, width, height, button, hint)
-    {
-        InitializeBookView();
-    }
-    virtual ~GUIWindow_Book() {}
-
-    virtual void Update();
-    virtual void Release();
-};
-struct GUIWindow_BooksWindow : public GUIWindow
-{
-    GUIWindow_BooksWindow(unsigned int x, unsigned int y, unsigned int width, unsigned int height, int button, const char *hint) :
+    GUIWindow_BooksButtonOverlay(unsigned int x, unsigned int y, unsigned int width, unsigned int height, int button, const char *hint) :
         GUIWindow(x, y, width, height, button, hint)
     {}
-    virtual ~GUIWindow_BooksWindow() {}
+    virtual ~GUIWindow_BooksButtonOverlay() {}
 
     virtual void Update();
 };
@@ -709,19 +697,8 @@
 
 
 // book ui
-void BookUI_Draw(WindowType book);
-void BookUI_Questbook_Draw();
-void BookUI_Autonotes_Draw();
-void BookUI_Map_Draw();
-void BookUI_Calendar_Draw();
-void BookUI_Journal_Draw();
-
-void OnCloseBook();
-void InitializeBookTextures();
-void InitializeBookFonts();
+void InitializeSpellBookTextures();
 void DrawSpellBookContent(Player *player);
-unsigned int  DrawLloydBeaconsScreen();
-void BookUI_DrawTownPortalMap();
 void LoadSpellbook(unsigned int uID); // idb
 void DrawSpellDescriptionPopup(int spell_index);
 void OnCloseSpellBookPage();
@@ -902,7 +879,7 @@
 extern struct GUIWindow *pGUIWindow_Settings;
 extern struct GUIWindow *pModalWindow;
 extern struct GUIWindow *pGUIWindow_EscMessageWindow;
-extern struct GUIWindow *pBooksWindow;
+extern struct GUIWindow *pBooksButtonOverlay;
 extern struct GUIWindow *pGUIWindow2;