Mercurial > mm7

comparison UI/UIShops.cpp @ 1749:42a1874a2171

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Finishing member struct renaming
author Grumpy7
date Mon, 30 Sep 2013 06:09:29 +0200
parents 19684d4bbe9a
children 999bf8c99514
comparison
equal deleted inserted replaced
1748:19684d4bbe9a 1749:42a1874a2171
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 {
1319 v69 = pGlobalTXT_LocalizationStrings[196];// "Select the Special Item to Buy" 1319 v69 = pGlobalTXT_LocalizationStrings[196];// "Select the Special Item to Buy"
1320 } 1320 }
1321 DrawTextAtStatusBar(v69, 0); 1321 DrawTextAtStatusBar(v69, 0);
1322 if ( !v117 ) 1322 if ( !v117 )
1323 { 1323 {
1324 dialog_window.DrawCurrentTime( pParty->field_3C.Shops_next_generation_time[(unsigned int)window_SpeakInHouse->ptr_1C] - pParty->uTimePlayed); 1324 dialog_window.DrawCurrentTime( pParty->PartyTimes.Shops_next_generation_time[(unsigned int)window_SpeakInHouse->ptr_1C] - pParty->uTimePlayed);
1325 return; 1325 return;
1326 } 1326 }
1327 v70 = pMouse->GetCursorPos(&v102); 1327 v70 = pMouse->GetCursorPos(&v102);
1328 result = v70->x + pSRZBufferLineOffsets[pMouse->GetCursorPos(&v100)->y]; 1328 result = v70->x + pSRZBufferLineOffsets[pMouse->GetCursorPos(&v100)->y];
1329 if ( pRenderer->pActiveZBuffer[result] & 0xFFFF ) 1329 if ( pRenderer->pActiveZBuffer[result] & 0xFFFF )
1450 v69 = pGlobalTXT_LocalizationStrings[196];// "Select the Special Item to Buy" 1450 v69 = pGlobalTXT_LocalizationStrings[196];// "Select the Special Item to Buy"
1451 } 1451 }
1452 DrawTextAtStatusBar(v69, 0); 1452 DrawTextAtStatusBar(v69, 0);
1453 if ( !v117 ) 1453 if ( !v117 )
1454 { 1454 {
1455 dialog_window.DrawCurrentTime( pParty->field_3C.Shops_next_generation_time[(unsigned int)window_SpeakInHouse->ptr_1C] - pParty->uTimePlayed); 1455 dialog_window.DrawCurrentTime( pParty->PartyTimes.Shops_next_generation_time[(unsigned int)window_SpeakInHouse->ptr_1C] - pParty->uTimePlayed);
1456 return; 1456 return;
1457 } 1457 }
1458 v70 = pMouse->GetCursorPos(&v102); 1458 v70 = pMouse->GetCursorPos(&v102);
1459 result = v70->x + pSRZBufferLineOffsets[v70->y]; 1459 result = v70->x + pSRZBufferLineOffsets[v70->y];
1460 if ( pRenderer->pActiveZBuffer[result] & 0xFFFF ) 1460 if ( pRenderer->pActiveZBuffer[result] & 0xFFFF )
2056 return; 2056 return;
2057 } 2057 }
2058 PlayHouseSound((unsigned int)window_SpeakInHouse->ptr_1C, HouseSound_Greeting_2); 2058 PlayHouseSound((unsigned int)window_SpeakInHouse->ptr_1C, HouseSound_Greeting_2);
2059 return; 2059 return;
2060 } 2060 }
2061 if ( (signed __int64)pParty->field_3C._shop_ban_times[(unsigned int)window_SpeakInHouse->ptr_1C]<= (signed __int64)pParty->uTimePlayed ) 2061 if ( (signed __int64)pParty->PartyTimes._shop_ban_times[(unsigned int)window_SpeakInHouse->ptr_1C]<= (signed __int64)pParty->uTimePlayed )
2062 { 2062 {
2063 if ( pParty->uNumGold <= 10000 ) 2063 if ( pParty->uNumGold <= 10000 )
2064 { 2064 {
2065 if ( !dword_F8B1E4 ) 2065 if ( !dword_F8B1E4 )
2066 return; 2066 return;