Mercurial > mm7

diff GUI/UI/UIShops.cpp @ 2573:0c67be4ec900

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
DrawTextureIndexed renamed to DrawTextureTransparentColorKey Changing more class Texture to class Image.
author a.parshin
date Sat, 05 Mar 2016 16:25:53 +0200
parents c674d547cc7c
children a76d408c5132
line wrap: on
line diff
--- a/GUI/UI/UIShops.cpp	Sat Mar 05 01:51:54 2016 +0200
+++ b/GUI/UI/UIShops.cpp	Sat Mar 05 16:25:53 2016 +0200
@@ -24,6 +24,8 @@
 #include "..\../Engine/Graphics/Indoor.h"
 
 
+Image *shop_ui_background = nullptr;
+
 
 //----- (004B910F) --------------------------------------------------------
 void  WeaponShopDialog()
@@ -84,7 +86,7 @@
     }
     case HOUSE_DIALOGUE_SHOP_BUY_STANDARD:
     {
-      pRenderer->DrawTextureIndexed(8, 8, ShopTexture);
+      pRenderer->DrawTextureAlphaNew(8/640.0f, 8/480.0f, shop_ui_background);
       item_X = 0;
       for ( uint i = 0; i < 6; ++i )
       {
@@ -135,7 +137,7 @@
 
     case HOUSE_DIALOGUE_SHOP_BUY_SPECIAL:
     {
-      pRenderer->DrawTextureIndexed(8, 8, ShopTexture);
+        pRenderer->DrawTextureAlphaNew(8 / 640.0f, 8 / 480.0f, shop_ui_background);
       item_X = 0;
       for ( uint i = 0; i < 6; ++i )
       {
@@ -410,7 +412,7 @@
 
     case HOUSE_DIALOGUE_SHOP_BUY_STANDARD:
     {
-      pRenderer->DrawTextureIndexed(8, 8, ShopTexture);// подложка
+        pRenderer->DrawTextureAlphaNew(8 / 640.0f, 8 / 480.0f, shop_ui_background);
       item_x = 0;
       for ( int i = 0; i < 8; ++i )// разместить вещи
       {
@@ -469,7 +471,7 @@
 
     case HOUSE_DIALOGUE_SHOP_BUY_SPECIAL:
     {
-      pRenderer->DrawTextureIndexed(8, 8, ShopTexture);
+        pRenderer->DrawTextureAlphaNew(8 / 640.0f, 8 / 480.0f, shop_ui_background);
       item_x = 0;
       for ( int i = 0; i < 8; ++i )
       {
@@ -757,7 +759,7 @@
 
     case HOUSE_DIALOGUE_SHOP_BUY_STANDARD:
     {
-      pRenderer->DrawTextureIndexed(8, 8, ShopTexture);
+        pRenderer->DrawTextureAlphaNew(8 / 640.0f, 8 / 480.0f, shop_ui_background);
       for ( uint i = 0; i < 6; ++i )
       {
         if ( pParty->StandartItemsInShops[(unsigned int)window_SpeakInHouse->ptr_1C][i].uItemID )
@@ -842,7 +844,7 @@
 
     case HOUSE_DIALOGUE_SHOP_BUY_SPECIAL:
     {
-      pRenderer->DrawTextureIndexed(8, 8, ShopTexture);
+        pRenderer->DrawTextureAlphaNew(8 / 640.0f, 8 / 480.0f, shop_ui_background);
       for ( uint i = 0; i < 6; ++i )
       {
         if (pParty->SpecialItemsInShops[(unsigned int)window_SpeakInHouse->ptr_1C][i].uItemID)
@@ -1131,7 +1133,7 @@
 
   if ( dialog_menu_id == HOUSE_DIALOGUE_SHOP_BUY_STANDARD)
   {
-    pRenderer->DrawTextureIndexed(8, 8, ShopTexture);
+      pRenderer->DrawTextureAlphaNew(8 / 640.0f, 8 / 480.0f, shop_ui_background);
     for ( uint i = 0; i < 6; ++i )
     {
       if ( pParty->StandartItemsInShops[(unsigned int)window_SpeakInHouse->ptr_1C][i].uItemID)
@@ -1217,7 +1219,7 @@
 
   if ( dialog_menu_id == HOUSE_DIALOGUE_SHOP_BUY_SPECIAL)
   {
-    pRenderer->DrawTextureIndexed(8, 8, ShopTexture);
+      pRenderer->DrawTextureAlphaNew(8 / 640.0f, 8 / 480.0f, shop_ui_background);
     for ( uint i = 0; i < 6; ++i )
     {
       if ( pParty->SpecialItemsInShops[(unsigned int)window_SpeakInHouse->ptr_1C][i].uItemID )