Mercurial > mm7

diff UI/UIPopup.cpp @ 1980:c1c74df0a33e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
changing most of auto types to their actual types
author Grumpy7
date Wed, 30 Oct 2013 00:47:37 -0700
parents 02bc0fac639f
children 33787c8938a5
line wrap: on
line diff
--- a/UI/UIPopup.cpp	Mon Oct 28 22:16:42 2013 -0700
+++ b/UI/UIPopup.cpp	Wed Oct 30 00:47:37 2013 -0700
@@ -576,7 +576,7 @@
         {
           v21 = dst_x;
           v22 = &pRenderer->pTargetSurface[dst_y * pRenderer->uTargetSurfacePitch + dst_x];
-          auto _v22_2 = v22;
+          ushort* _v22_2 = v22;
           v23 = i - dst_y;
           v115 = i - dst_y;
           while ( 1 )
@@ -616,11 +616,11 @@
       pDesc.dwSize = 124;
       if ( pRenderer->LockSurface_DDraw4(pSprites_LOD->pHardwareSprites[v10->pHwSpriteIDs[0]].pTextureSurface, &pDesc, DDLOCK_WAIT) )
       {
-        auto src = (unsigned __int16 *)pDesc.lpSurface;
+        ushort* src = (unsigned __int16 *)pDesc.lpSurface;
         uint num_top_scanlines_above_frame_y = i - dst_y;
         for (uint y = dst_y; y < dst_w; ++y)
         {
-          auto dst = &pRenderer->pTargetSurface[y * pRenderer->uTargetSurfacePitch + dst_x];
+          ushort* dst = &pRenderer->pTargetSurface[y * pRenderer->uTargetSurfacePitch + dst_x];
 
           uint src_y = num_top_scanlines_above_frame_y + y;
           for (uint x = dst_x; x < dst_z; ++x)
@@ -1604,7 +1604,7 @@
   int item_pid = (pRenderer->pActiveZBuffer[cursor.x + pSRZBufferLineOffsets[cursor.y]] & 0xFFFF) - 1;
   if (item_pid == -1) //added here to avoid crash
     return;
-  auto item = &pPlayers[uActiveCharacter]->pInventoryItemList[item_pid];
+  ItemGen* item = &pPlayers[uActiveCharacter]->pInventoryItemList[item_pid];
 
   if (cursor.x <= 13 || cursor.x >= 462)//items out of inventory(вещи вне инвентаря)
   {