Mercurial > mm7

diff GUI/GUIWindow.h @ 2572:d87bfbd3bb3b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Step towards unification of Texture and RGBTexture (class Image)
author a.parshin
date Sat, 05 Mar 2016 01:51:54 +0200
parents f2a8ed07e921
children 0c67be4ec900
line wrap: on
line diff
--- a/GUI/GUIWindow.h	Mon Oct 05 00:19:13 2015 +0200
+++ b/GUI/GUIWindow.h	Sat Mar 05 01:51:54 2016 +0200
@@ -289,8 +289,8 @@
   WINDOW_Scroll          = 0x1E,
   WINDOW_CastSpell_InInventory = 31,
   WINDOW_ModalWindow    = 70,
-  WINDOW_50             = 80,
-  WINDOW_59             = 89,
+  WINDOW_50             = 80, // Debug
+  WINDOW_59             = 89, // Debug: Item Generation Window
   WINDOW_PressedButton2 = 90,
   WINDOW_CharactersPressedButton = 91,
   WINDOW_PressedButton       = 92,
@@ -342,7 +342,7 @@
   void DrawTitleText(GUIFont *a2, signed int uHorizontalMargin, unsigned int uVerticalMargin, unsigned __int16 uDefaultColor, const char *pInString, unsigned int uLineSpacing);
   void DrawShops_next_generation_time_string(__int64 next_generation_time);
   void HouseDialogManager();
-  void DrawMessageBox(int arg0);
+  void DrawMessageBox(bool inside_game_viewport);
   GUIButton *GetControl(unsigned int uID);
   void _41D08F_set_keyboard_control_group(int num_buttons, int a3, int a4, int a5);
   void _41D73D_draw_buff_tooltip();
@@ -350,6 +350,8 @@
   virtual void Update() {}
   virtual void Release();
 
+  static void InitializeGUI();
+
   unsigned int uFrameX;
   unsigned int uFrameY;
   unsigned int uFrameWidth;
@@ -671,7 +673,7 @@
 
 void UI_OnMouseRightClick(Vec2_int_ *_this);
 
-void __fastcall DrawPopupWindow(unsigned int uX, unsigned int uY, unsigned int uWidth, unsigned int uHeight); // idb
+void DrawPopupWindow(unsigned int uX, unsigned int uY, unsigned int uWidth, unsigned int uHeight); // idb
 void DrawMM7CopyrightWindow();
 //void LoadFonts_and_DrawCopyrightWindow();
 void GUI_UpdateWindows();
@@ -680,7 +682,7 @@
 void CreateAwardsScrollBar();
 void ReleaseAwardsScrollBar();
 void Inventory_ItemPopupAndAlchemy();
-void __fastcall LoadThumbnailLloydTexture(unsigned int uSlot, unsigned int uPlayer);
+void LoadThumbnailLloydTexture(unsigned int uSlot, unsigned int uPlayer);
 unsigned int UI_GetHealthManaAndOtherQualitiesStringColor(signed int current_pos, signed int base_pos);
 unsigned int __fastcall GetSizeInInventorySlots(unsigned int uNumPixels);
 struct GUIButton *__fastcall GUI_HandleHotkey(unsigned __int8 uHotkey); // idb