comparison UI/UIShops.cpp @ 2376:bcd7fadbf7d2

Слияние
author Ritor1
date Mon, 12 May 2014 12:28:06 +0600
parents bddcaf5d5db2
children 6a7309a847ea
comparison
equal deleted inserted replaced
2375:14c05b876218 2376:bcd7fadbf7d2
1809 // sprintf(pTmpBuf.data(), "%s%03d", spellbook_texture_filename_suffices[v11 / 4], v2); not used 1809 // sprintf(pTmpBuf.data(), "%s%03d", spellbook_texture_filename_suffices[v11 / 4], v2); not used
1810 if ( pMouse->GetCursorPos(&a2)->y <= 320 ) 1810 if ( pMouse->GetCursorPos(&a2)->y <= 320 )
1811 v3 = pMouse->GetCursorPos(&a2)->y + 30; 1811 v3 = pMouse->GetCursorPos(&a2)->y + 30;
1812 else 1812 else
1813 v3 = 30; 1813 v3 = 30;
1814 a1.Hint = 0; 1814 a1.Hint = nullptr;
1815 a1.uFrameY = v3; 1815 a1.uFrameY = v3;
1816 a1.uFrameWidth = 328; 1816 a1.uFrameWidth = 328;
1817 a1.uFrameHeight = 68; 1817 a1.uFrameHeight = 68;
1818 a1.uFrameX = 90; 1818 a1.uFrameX = 90;
1819 a1.uFrameZ = 417; 1819 a1.uFrameZ = 417;