--- a/UI/UIShops.cpp	Thu Aug 29 12:04:33 2013 +0600
+++ b/UI/UIShops.cpp	Thu Aug 29 12:04:55 2013 +0600
@@ -14,7 +14,7 @@
 #include "..\Viewport.h"
 
 //----- (004B910F) --------------------------------------------------------
-void __cdecl WeaponShopDialog()
+void  WeaponShopDialog()
 {
   int v0; // ebx@1
   int pNumActiveItem; // eax@6
@@ -183,7 +183,7 @@
           v49 += 30;
           v51 = 60 - ((signed int)v50->uTextureWidth >> 1);
           pRenderer->DrawTextureTransparent(v51 + pItemNum, v49, v50);
-          sub_40F92A(&pRenderer->pActiveZBuffer[v51 + pItemNum + 640 * v49], ItemsInShopTexture[(signed int)v109], (int)((char *)v109 + 1));
+          ZBuffer_DoFill2(&pRenderer->pActiveZBuffer[v51 + pItemNum + 640 * v49], ItemsInShopTexture[(signed int)v109], (int)((char *)v109 + 1));
           v48 = v109;
         }
         pItemNum += 70;
@@ -376,7 +376,7 @@
           v53 = ItemsInShopTexture[(signed int)v109];
           v54 = 60 - ((signed int)v53->uTextureWidth >> 1);
           pRenderer->DrawTextureTransparent(v54 + pItemNum, word_F8B158[(signed int)v109] + 30, v53);
-          sub_40F92A(&pRenderer->pActiveZBuffer[v54 + pItemNum + 640 * v52], ItemsInShopTexture[(signed int)v109], (int)((char *)v109 + 1));
+          ZBuffer_DoFill2(&pRenderer->pActiveZBuffer[v54 + pItemNum + 640 * v52], ItemsInShopTexture[(signed int)v109], (int)((char *)v109 + 1));
         }
         v109 = (const char **)((char *)v109 + 1);
         pItemNum += 70;
@@ -538,7 +538,7 @@
 }
 
 //----- (004BA928) --------------------------------------------------------
-void __cdecl ArmorShopDialog()
+void  ArmorShopDialog()
 {
   signed int v1; // esi@8
   unsigned int v2; // eax@10
@@ -1106,7 +1106,7 @@
   }
 }
 //----- (004B9CC6) --------------------------------------------------------
-void __cdecl AlchemistDialog()
+void  AlchemistDialog()
 {
   int v0;
   int pNumActiveItem; // eax@7
@@ -1287,7 +1287,7 @@
           else if ( (signed int)v48 < 18 )
             v48 = 18;
           pRenderer->DrawTextureTransparent(v48, v47, v46);
-          sub_40F92A(&pRenderer->pActiveZBuffer[v48 + 640 * v47], ItemsInShopTexture[v114], v114 + 1);
+          ZBuffer_DoFill2(&pRenderer->pActiveZBuffer[v48 + 640 * v47], ItemsInShopTexture[v114], v114 + 1);
         }
         ++v114;
       }
@@ -1317,7 +1317,7 @@
               v52 = 18;
           }
           pRenderer->DrawTextureTransparent(v52, v51, v50);
-          sub_40F92A(&pRenderer->pActiveZBuffer[v52 + 640 * v51], ItemsInShopTexture[v114 + 6], v114 + 7);
+          ZBuffer_DoFill2(&pRenderer->pActiveZBuffer[v52 + 640 * v51], ItemsInShopTexture[v114 + 6], v114 + 7);
         }
         ++v114;
       }
@@ -1489,7 +1489,7 @@
               v56 = 18;
           }
           pRenderer->DrawTextureTransparent(v56, v55, v54);
-          sub_40F92A(&pRenderer->pActiveZBuffer[v56 + 640 * v55], ItemsInShopTexture[v114], v114 + 1);
+          ZBuffer_DoFill2(&pRenderer->pActiveZBuffer[v56 + 640 * v55], ItemsInShopTexture[v114], v114 + 1);
         }
         ++v114;
       }
@@ -1519,7 +1519,7 @@
               v60 = 18;
           }
           pRenderer->DrawTextureTransparent(v60, v59, v58);
-          sub_40F92A(&pRenderer->pActiveZBuffer[v60 + 640 * v59], ItemsInShopTexture[v114 + 6], v114 + 7);
+          ZBuffer_DoFill2(&pRenderer->pActiveZBuffer[v60 + 640 * v59], ItemsInShopTexture[v114 + 6], v114 + 7);
         }
         ++v114;
       }
@@ -1857,7 +1857,7 @@
             v52 = 18;
         }
         pRenderer->DrawTextureTransparent(v52, v51, v50);
-        sub_40F92A(&pRenderer->pActiveZBuffer[v52 + 640 * v51], ItemsInShopTexture[v122], v122 + 1);
+        ZBuffer_DoFill2(&pRenderer->pActiveZBuffer[v52 + 640 * v51], ItemsInShopTexture[v122], v122 + 1);
         v49 = v122;
       }
       ++v49;
@@ -1887,7 +1887,7 @@
             v56 = 18;
         }
         pRenderer->DrawTextureTransparent(v56, v55, v54);
-        sub_40F92A(&pRenderer->pActiveZBuffer[v56 + 640 * v55], ItemsInShopTexture[v122 + 6], v122 + 7);
+        ZBuffer_DoFill2(&pRenderer->pActiveZBuffer[v56 + 640 * v55], ItemsInShopTexture[v122 + 6], v122 + 7);
       }
       ++v122;
     }
@@ -1987,7 +1987,7 @@
             v60 = 18;
         }
         pRenderer->DrawTextureTransparent(v60, v59, ItemsInShopTexture[v49]);
-        sub_40F92A(&pRenderer->pActiveZBuffer[v60 + 640 * v59], ItemsInShopTexture[v122], v122 + 1);
+        ZBuffer_DoFill2(&pRenderer->pActiveZBuffer[v60 + 640 * v59], ItemsInShopTexture[v122], v122 + 1);
         v49 = v122;
       }
       ++v49;
@@ -2018,7 +2018,7 @@
             v64 = 18;
         }
         pRenderer->DrawTextureTransparent(v64, v63, ItemsInShopTexture[v122 + 6]);
-        sub_40F92A(&pRenderer->pActiveZBuffer[v64 + 640 * v63], ItemsInShopTexture[v122 + 6], v122 + 7);
+        ZBuffer_DoFill2(&pRenderer->pActiveZBuffer[v64 + 640 * v63], ItemsInShopTexture[v122 + 6], v122 + 7);
       }
       ++v122;
     }
@@ -2067,7 +2067,7 @@
         return;
       }
       v70 = pMouse->GetCursorPos(&v102);
-      result = v70->x + pSRZBufferLineOffsets[pMouse->GetCursorPos(&v100)->y];
+      result = v70->x + pSRZBufferLineOffsets[v70->y];
       if ( pRenderer->pActiveZBuffer[result] & 0xFFFF )
       {
         v71 = (pRenderer->pActiveZBuffer[result] & 0xFFFF) - 1;
@@ -2293,7 +2293,7 @@
   return;
 }
 //----- (004BDB56) --------------------------------------------------------
-void __cdecl UIShop_Buy_Identify_Repair()
+void  UIShop_Buy_Identify_Repair()
 {
   int v8; // eax@15
   unsigned int pItemID; // esi@20
@@ -2483,8 +2483,8 @@
       uPriceItemService = pPlayers[uActiveCharacter]->GetBuyingPrice(bought_item->GetValue(), p2DEvents[(unsigned int)window_SpeakInHouse->ptr_1C - 1].fPriceMultiplier);
       uNumSeconds = 0;
       a3 = 0;
-      if ( pMapStats->GetMapInfo(pCurrentMapName.data()) )
-        a3 = pMapStats->pInfos[pMapStats->GetMapInfo(pCurrentMapName.data())]._steal_perm;
+      if ( pMapStats->GetMapInfo(pCurrentMapName) )
+        a3 = pMapStats->pInfos[pMapStats->GetMapInfo(pCurrentMapName)]._steal_perm;
       party_reputation = GetPartyReputation();
       if (pPlayers[uActiveCharacter]->CanSteal())
       {
@@ -2582,7 +2582,7 @@
   }
 }
 //----- (004B1A2D) --------------------------------------------------------
-void __cdecl ShowPopupShopItem()
+void  ShowPopupShopItem()
 {
   POINT *v1; // esi@5
   unsigned int v2; // eax@5
@@ -2646,7 +2646,7 @@
   }
 }
 //----- (004B1D27) --------------------------------------------------------
-void __cdecl GetHouseGoodbyeSpeech()
+void  GetHouseGoodbyeSpeech()
 {
   signed int v2; // edi@10
   signed int v5; // edi@20