diff GUI/GUIButton.cpp @ 2574:dd36326a9994

More texture refactoring GetLeather -> DrawTextureCustomHeight
author a.parshin
date Mon, 07 Mar 2016 03:48:40 +0200
parents f2a8ed07e921
children
line wrap: on
line diff
--- a/GUI/GUIButton.cpp	Sat Mar 05 16:25:53 2016 +0200
+++ b/GUI/GUIButton.cpp	Mon Mar 07 03:48:40 2016 +0200
@@ -5,13 +5,15 @@
 #define _CRT_SECURE_NO_WARNINGS
 
 #include "Engine/Engine.h"
+#include "Engine/LOD.h"
+#include "Engine/Texts.h"
+
+#include "GUI/GUIWindow.h"
 
 #include "GUIButton.h"
 #include "GUIWindow.h"
 #include "GUIFont.h"
 
-#include "Engine/LOD.h"
-#include "Engine/Texts.h"
 #include "OSWindow.h"
 
 
@@ -217,17 +219,17 @@
       }
     }
     pBtn_Up = pGUIWindow_CurrentMenu->CreateButton(438, 46,
-                   pIcons_LOD->GetTexture(uTextureID_ar_up_up)->uTextureWidth,
-                   pIcons_LOD->GetTexture(uTextureID_ar_up_up)->uTextureHeight,
+                   ui_ar_up_up->GetWidth(),
+                   ui_ar_up_up->GetHeight(),
                    1, 0, UIMSG_ClickAwardsUpBtn, 0, 0, "",
-                   pIcons_LOD->GetTexture(uTextureID_ar_up_up),
-                   pIcons_LOD->GetTexture(uTextureID_ar_up_dn), 0);
+                   ui_ar_up_up,
+                   ui_ar_up_dn, 0);
     pBtn_Down = pGUIWindow_CurrentMenu->CreateButton(438, 292,
-                   pIcons_LOD->GetTexture(uTextureID_ar_dn_up)->uTextureWidth,
-                   pIcons_LOD->GetTexture(uTextureID_ar_dn_up)->uTextureHeight,
+                   ui_ar_dn_up->GetWidth(),
+                   ui_ar_dn_up->GetHeight(),
                    1, 0, UIMSG_ClickAwardsDownBtn, 0, 0, "",
-                   pIcons_LOD->GetTexture(uTextureID_ar_dn_up),
-                   pIcons_LOD->GetTexture(uTextureID_ar_dn_dn), 0);
+                   ui_ar_dn_up,
+                   ui_ar_dn_dn, 0);
     ptr_507BA4 = pGUIWindow_CurrentMenu->CreateButton(440, 62, 16, 232, 1, 0, UIMSG_ClickAwardScrollBar, 0, 0, "", 0);
   }
 }
@@ -238,6 +240,6 @@
   pDialogueWindow = new GUIWindow(0, 0, window->GetWidth(), 345, 0, 0);
   pBtn_ExitCancel = pDialogueWindow->CreateButton( 471, 445,  169, 35, 1, 0, UIMSG_Escape,  0,  0,
                  pGlobalTXT_LocalizationStrings[74],  //"End Conversation"
-                 pIcons_LOD->GetTexture(uExitCancelTextureId), 0);
+      ui_exit_cancel_button_background, 0);
   pDialogueWindow->CreateButton(8, 8, 450, 320, 1, 0, UIMSG_BuyInShop_Identify_Repair, 0, 0, "", 0);
 }
\ No newline at end of file