diff GUI/GUIWindow.h @ 2574:dd36326a9994

More texture refactoring GetLeather -> DrawTextureCustomHeight
author a.parshin
date Mon, 07 Mar 2016 03:48:40 +0200
parents 0c67be4ec900
children a76d408c5132
line wrap: on
line diff
--- a/GUI/GUIWindow.h	Sat Mar 05 16:25:53 2016 +0200
+++ b/GUI/GUIWindow.h	Mon Mar 07 03:48:40 2016 +0200
@@ -318,7 +318,7 @@
 };
 
 struct GUIButton;
-struct Texture;
+struct Texture_MM7;
 
 
 #define WINDOW_INPUT_NONE        0
@@ -335,7 +335,8 @@
     virtual ~GUIWindow() {}
 
   GUIButton *CreateButton(unsigned int uX, unsigned int uY, unsigned int uWidth, unsigned int uHeight, int a6, int a7, 
-	                      UIMessageType msg, unsigned int msg_param, unsigned __int8 uHotkey, const char *pName, struct Texture *pTextures, ...);
+	                      UIMessageType msg, unsigned int msg_param, unsigned __int8 uHotkey, const char *pName,
+                            struct Image *pTextures, ...);
   void DrawFlashingInputCursor(signed int uX, int uY, struct GUIFont *a2);
   int DrawTextInRect(GUIFont *pFont, unsigned int uX, unsigned int uY, unsigned int uColor, const char *text, int rect_width, int reverse_text);
   void DrawText(GUIFont *a2, signed int uX, int uY, unsigned short uFontColor, const char *Str, bool present_time_transparency, int max_text_height, signed int uFontShadowColor);
@@ -682,7 +683,6 @@
 void CreateAwardsScrollBar();
 void ReleaseAwardsScrollBar();
 void Inventory_ItemPopupAndAlchemy();
-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
@@ -713,8 +713,8 @@
 
 
 void __fastcall ZBuffer_Fill(int *pZBuffer, int uTextureId, int iZValue);
-void __fastcall ZBuffer_DoFill(int *pZBuffer, struct Texture *pTex, int uZValue);
-void __fastcall ZBuffer_DoFill2(int *pZBuffer, struct Texture *a2, int a3); // idb
+void __fastcall ZBuffer_DoFill(int *pZBuffer, struct Texture_MM7 *pTex, int uZValue);
+void __fastcall ZBuffer_DoFill2(int *pZBuffer, struct Texture_MM7 *a2, int a3); // idb
 
 
 
@@ -732,6 +732,12 @@
 #pragma pack(push, 1)
 struct GUIButton
 {
+    GUIButton()
+    {
+        for (unsigned int i = 0; i < 5; ++i)
+            pTextures[i] = nullptr;
+    }
+
 void DrawLabel(const char *label_text, struct GUIFont *pFont, int a5, int uFontShadowColor);
 
   void Release();
@@ -752,7 +758,7 @@
   GUIButton *pPrev;
   GUIButton *pNext;
   struct GUIWindow *pParent;
-  struct Texture *pTextures[5];
+  struct Image *pTextures[5];
   unsigned int uNumTextures;
   unsigned __int8 uHotkey;
   char pButtonName[32];
@@ -920,4 +926,22 @@
 
 extern class Image *ui_exit_cancel_button_background;
 extern class Image *game_ui_right_panel_frame;
-extern unsigned int uExitCancelTextureId;
\ No newline at end of file
+extern class Image *dialogue_ui_x_ok_u;
+extern class Image *dialogue_ui_x_x_u;
+
+extern class Image *ui_buttdesc2;
+extern class Image *ui_buttyes2;
+
+extern class Image *ui_btn_npc_right;
+extern class Image *ui_btn_npc_left;
+
+extern class Image *ui_ar_dn_dn;
+extern class Image *ui_ar_dn_up;
+extern class Image *ui_ar_up_dn;
+extern class Image *ui_ar_up_up;
+
+extern class Image *ui_leather_mm6;
+extern class Image *ui_leather_mm7;
+
+//extern unsigned int 507C20_gamma_slider_left_texid; // 507C20
+//extern unsigned int 507C24_gamma_slider_right_texid; // 507C24
\ No newline at end of file