Mercurial > mm7

comparison UI/UIShops.cpp @ 1753:999bf8c99514

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Mon, 30 Sep 2013 11:41:55 +0600
parents 07c7f446a929 42a1874a2171
children 421c29d4ab3e
comparison
equal deleted inserted replaced
1752:07c7f446a929 1753:999bf8c99514
114 dialog_window.DrawTitleText(pFontArrus, 0, (174 - pFontArrus->CalcTextHeight(pText, &dialog_window, 0, 0)) / 2 + 138, TargetColor(0xFFu, 0xFFu, 0xFFu), pText, 3); 114 dialog_window.DrawTitleText(pFontArrus, 0, (174 - pFontArrus->CalcTextHeight(pText, &dialog_window, 0, 0)) / 2 + 138, TargetColor(0xFFu, 0xFFu, 0xFFu), pText, 3);
115 } 115 }
116 } 116 }
117 } 117 }
118 else 118 else
119 dialog_window.DrawCurrentTime( pParty->field_3C.Shops_next_generation_time[(unsigned int)window_SpeakInHouse->ptr_1C] - pParty->uTimePlayed);// 7 119 dialog_window.DrawCurrentTime( pParty->PartyTimes.Shops_next_generation_time[(unsigned int)window_SpeakInHouse->ptr_1C] - pParty->uTimePlayed);// 7
120 } 120 }
121 break; 121 break;
122 } 122 }
123 123
124 case HOUSE_DIALOGUE_SHOP_BUY_SPECIAL: 124 case HOUSE_DIALOGUE_SHOP_BUY_SPECIAL:
165 dialog_window.DrawTitleText(pFontArrus, 0, (174 - pFontArrus->CalcTextHeight(pText, &dialog_window, 0, 0)) / 2 + 138, TargetColor(0xFFu, 0xFFu, 0xFFu), pText, 3); 165 dialog_window.DrawTitleText(pFontArrus, 0, (174 - pFontArrus->CalcTextHeight(pText, &dialog_window, 0, 0)) / 2 + 138, TargetColor(0xFFu, 0xFFu, 0xFFu), pText, 3);
166 } 166 }
167 } 167 }
168 } 168 }
169 else 169 else
170 dialog_window.DrawCurrentTime( pParty->field_3C.Shops_next_generation_time[(unsigned int)window_SpeakInHouse->ptr_1C] - pParty->uTimePlayed); 170 dialog_window.DrawCurrentTime( pParty->PartyTimes.Shops_next_generation_time[(unsigned int)window_SpeakInHouse->ptr_1C] - pParty->uTimePlayed);
171 } 171 }
172 break; 172 break;
173 } 173 }
174 174
175 case HOUSE_DIALOGUE_SHOP_SELL: 175 case HOUSE_DIALOGUE_SHOP_SELL:
448 pText = BuildDialogueString(pGlobalTXT_LocalizationStrings[181], uActiveCharacter - 1, selected_item, (char *)window_SpeakInHouse->ptr_1C, 2, 0); //"Steal %24" 448 pText = BuildDialogueString(pGlobalTXT_LocalizationStrings[181], uActiveCharacter - 1, selected_item, (char *)window_SpeakInHouse->ptr_1C, 2, 0); //"Steal %24"
449 dialog_window.DrawTitleText(pFontArrus, 0, (174 - pFontArrus->CalcTextHeight(pText, &dialog_window, 0, 0)) / 2 + 138, TargetColor(0xFFu, 0xFFu, 0xFFu), pText, 3); 449 dialog_window.DrawTitleText(pFontArrus, 0, (174 - pFontArrus->CalcTextHeight(pText, &dialog_window, 0, 0)) / 2 + 138, TargetColor(0xFFu, 0xFFu, 0xFFu), pText, 3);
450 } 450 }
451 return; 451 return;
452 } 452 }
453 dialog_window.DrawCurrentTime( pParty->field_3C.Shops_next_generation_time[window_SpeakInHouse->par1C]- pParty->uTimePlayed); 453 dialog_window.DrawCurrentTime( pParty->PartyTimes.Shops_next_generation_time[window_SpeakInHouse->par1C]- pParty->uTimePlayed);
454 return; 454 return;
455 } 455 }
456 break; 456 break;
457 457
458 case HOUSE_DIALOGUE_SHOP_BUY_SPECIAL: 458 case HOUSE_DIALOGUE_SHOP_BUY_SPECIAL:
511 pText = BuildDialogueString(pGlobalTXT_LocalizationStrings[181], uActiveCharacter - 1, selected_item, (char *)window_SpeakInHouse->ptr_1C, 2, 0);//"Steal %24" 511 pText = BuildDialogueString(pGlobalTXT_LocalizationStrings[181], uActiveCharacter - 1, selected_item, (char *)window_SpeakInHouse->ptr_1C, 2, 0);//"Steal %24"
512 dialog_window.DrawTitleText(pFontArrus, 0, (174 - pFontArrus->CalcTextHeight(pText, &dialog_window, 0, 0)) / 2 + 138, TargetColor(0xFFu, 0xFFu, 0xFFu), pText, 3); 512 dialog_window.DrawTitleText(pFontArrus, 0, (174 - pFontArrus->CalcTextHeight(pText, &dialog_window, 0, 0)) / 2 + 138, TargetColor(0xFFu, 0xFFu, 0xFFu), pText, 3);
513 } 513 }
514 return; 514 return;
515 } 515 }
516 dialog_window.DrawCurrentTime( pParty->field_3C.Shops_next_generation_time[window_SpeakInHouse->par1C]- pParty->uTimePlayed); 516 dialog_window.DrawCurrentTime( pParty->PartyTimes.Shops_next_generation_time[window_SpeakInHouse->par1C]- pParty->uTimePlayed);
517 return; 517 return;
518 } 518 }
519 break; 519 break;
520 520
521 case HOUSE_DIALOGUE_SHOP_DISPLAY_EQUIPMENT: 521 case HOUSE_DIALOGUE_SHOP_DISPLAY_EQUIPMENT:
805 DrawTextAtStatusBar(pGlobalTXT_LocalizationStrings[185], 0); 805 DrawTextAtStatusBar(pGlobalTXT_LocalizationStrings[185], 0);
806 else 806 else
807 DrawTextAtStatusBar(pGlobalTXT_LocalizationStrings[195], 0); 807 DrawTextAtStatusBar(pGlobalTXT_LocalizationStrings[195], 0);
808 if ( !item_num ) 808 if ( !item_num )
809 { 809 {
810 dialog_window.DrawCurrentTime( pParty->field_3C.Shops_next_generation_time[ (unsigned int)window_SpeakInHouse->ptr_1C] - pParty->uTimePlayed); 810 dialog_window.DrawCurrentTime( pParty->PartyTimes.Shops_next_generation_time[ (unsigned int)window_SpeakInHouse->ptr_1C] - pParty->uTimePlayed);
811 return; 811 return;
812 } 812 }
813 pMouse->GetCursorPos(&mouse); 813 pMouse->GetCursorPos(&mouse);
814 if ( pRenderer->pActiveZBuffer[mouse.x + pSRZBufferLineOffsets[mouse.y]] & 0xFFFF ) 814 if ( pRenderer->pActiveZBuffer[mouse.x + pSRZBufferLineOffsets[mouse.y]] & 0xFFFF )
815 { 815 {
893 DrawTextAtStatusBar(pGlobalTXT_LocalizationStrings[185], 0); 893 DrawTextAtStatusBar(pGlobalTXT_LocalizationStrings[185], 0);
894 else 894 else
895 DrawTextAtStatusBar(pGlobalTXT_LocalizationStrings[196], 0); 895 DrawTextAtStatusBar(pGlobalTXT_LocalizationStrings[196], 0);
896 if ( !item_num ) 896 if ( !item_num )
897 { 897 {
898 dialog_window.DrawCurrentTime( pParty->field_3C.Shops_next_generation_time[ (unsigned int)window_SpeakInHouse->ptr_1C] - pParty->uTimePlayed); 898 dialog_window.DrawCurrentTime( pParty->PartyTimes.Shops_next_generation_time[ (unsigned int)window_SpeakInHouse->ptr_1C] - pParty->uTimePlayed);
899 return; 899 return;
900 } 900 }
901 pMouse->GetCursorPos(&mouse); 901 pMouse->GetCursorPos(&mouse);
902 if ( pRenderer->pActiveZBuffer[mouse.x + pSRZBufferLineOffsets[mouse.y]] & 0xFFFF ) 902 if ( pRenderer->pActiveZBuffer[mouse.x + pSRZBufferLineOffsets[mouse.y]] & 0xFFFF )
903 { 903 {
1180 DrawTextAtStatusBar(pGlobalTXT_LocalizationStrings[185], 0);// "Steal item" 1180 DrawTextAtStatusBar(pGlobalTXT_LocalizationStrings[185], 0);// "Steal item"
1181 else 1181 else
1182 DrawTextAtStatusBar(pGlobalTXT_LocalizationStrings[195], 0);// "Select the Item to Buy" 1182 DrawTextAtStatusBar(pGlobalTXT_LocalizationStrings[195], 0);// "Select the Item to Buy"
1183 if ( !item_num ) 1183 if ( !item_num )
1184 { 1184 {
1185 dialog_window.DrawCurrentTime( pParty->field_3C.Shops_next_generation_time[(unsigned int)window_SpeakInHouse->ptr_1C] - pParty->uTimePlayed); 1185 dialog_window.DrawCurrentTime( pParty->PartyTimes.Shops_next_generation_time[(unsigned int)window_SpeakInHouse->ptr_1C] - pParty->uTimePlayed);
1186 return; 1186 return;
1187 } 1187 }
1188 pMouse->GetCursorPos(&mouse); 1188 pMouse->GetCursorPos(&mouse);
1189 if ( pRenderer->pActiveZBuffer[mouse.x + pSRZBufferLineOffsets[mouse.y]] & 0xFFFF ) 1189 if ( pRenderer->pActiveZBuffer[mouse.x + pSRZBufferLineOffsets[mouse.y]] & 0xFFFF )
1190 { 1190 {
1268 DrawTextAtStatusBar(pGlobalTXT_LocalizationStrings[185], 0);// "Steal item" 1268 DrawTextAtStatusBar(pGlobalTXT_LocalizationStrings[185], 0);// "Steal item"
1269 else 1269 else
1270 DrawTextAtStatusBar(pGlobalTXT_LocalizationStrings[196], 0);// "Select the Special Item to Buy" 1270 DrawTextAtStatusBar(pGlobalTXT_LocalizationStrings[196], 0);// "Select the Special Item to Buy"
1271 if ( !item_num ) 1271 if ( !item_num )
1272 { 1272 {
1273 dialog_window.DrawCurrentTime( pParty->field_3C.Shops_next_generation_time[(unsigned int)window_SpeakInHouse->ptr_1C] - pParty->uTimePlayed); 1273 dialog_window.DrawCurrentTime( pParty->PartyTimes.Shops_next_generation_time[(unsigned int)window_SpeakInHouse->ptr_1C] - pParty->uTimePlayed);
1274 return; 1274 return;
1275 } 1275 }
1276 pMouse->GetCursorPos(&mouse); 1276 pMouse->GetCursorPos(&mouse);
1277 if ( pRenderer->pActiveZBuffer[mouse.x + pSRZBufferLineOffsets[mouse.y]] & 0xFFFF ) 1277 if ( pRenderer->pActiveZBuffer[mouse.x + pSRZBufferLineOffsets[mouse.y]] & 0xFFFF )
1278 { 1278 {
1831 return; 1831 return;
1832 } 1832 }
1833 PlayHouseSound((unsigned int)window_SpeakInHouse->ptr_1C, HouseSound_Greeting_2); 1833 PlayHouseSound((unsigned int)window_SpeakInHouse->ptr_1C, HouseSound_Greeting_2);
1834 return; 1834 return;
1835 } 1835 }
1836 if ( (signed __int64)pParty->field_3C._shop_ban_times[(unsigned int)window_SpeakInHouse->ptr_1C]<= (signed __int64)pParty->uTimePlayed ) 1836 if ( (signed __int64)pParty->PartyTimes._shop_ban_times[(unsigned int)window_SpeakInHouse->ptr_1C]<= (signed __int64)pParty->uTimePlayed )
1837 { 1837 {
1838 if ( pParty->uNumGold <= 10000 ) 1838 if ( pParty->uNumGold <= 10000 )
1839 { 1839 {
1840 if ( !dword_F8B1E4 ) 1840 if ( !dword_F8B1E4 )
1841 return; 1841 return;