Mercurial > mm7

comparison UI/UIGuilds.cpp @ 1762:2b8b748a222a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Tue, 01 Oct 2013 09:33:38 +0600
parents 24e756a50073
children 2e6d3cd052e0
comparison
equal deleted inserted replaced
1761:5be18330f9a3 1762:2b8b748a222a
221 if ( dialog_menu_id != HOUSE_DIALOGUE_SHOP_BUY_STANDARD) 221 if ( dialog_menu_id != HOUSE_DIALOGUE_SHOP_BUY_STANDARD)
222 statusbar_string = pGlobalTXT_LocalizationStrings[196]; //"Select the Special Item to Buy" 222 statusbar_string = pGlobalTXT_LocalizationStrings[196]; //"Select the Special Item to Buy"
223 DrawTextAtStatusBar(statusbar_string, 0); 223 DrawTextAtStatusBar(statusbar_string, 0);
224 if ( !v8 ) 224 if ( !v8 )
225 { 225 {
226 working_window.DrawCurrentTime(pParty->PartyTimes.Shops_next_generation_time[window_SpeakInHouse->par1C] - pParty->uTimePlayed);//" 14 " 226 working_window.DrawShops_next_generation_time_string(pParty->PartyTimes.Shops_next_generation_time[window_SpeakInHouse->par1C] - pParty->uTimePlayed);//" 14 "
227 return; 227 return;
228 } 228 }
229 v12 = pMouse->GetCursorPos(&v51); 229 v12 = pMouse->GetCursorPos(&v51);
230 result = v12->x + pSRZBufferLineOffsets[pMouse->GetCursorPos(&v50)->y]; 230 result = v12->x + pSRZBufferLineOffsets[pMouse->GetCursorPos(&v50)->y];
231 v13 = pRenderer->pActiveZBuffer[result] & 0xFFFF; 231 v13 = pRenderer->pActiveZBuffer[result] & 0xFFFF;