Mercurial > mm7

comparison UIHouses.cpp @ 1174:05247ad19710

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Fri, 31 May 2013 09:54:44 +0600
parents cf6cd674c398
children 29a8defbad9e
comparison
equal deleted inserted replaced
1173:0158f383b492 1174:05247ad19710
1891 Party::TakeGold(s1); 1891 Party::TakeGold(s1);
1892 1892
1893 v5 = &transport_schedule[transport_routes[(unsigned int)window_SpeakInHouse->ptr_1C - HOUSE_STABLES_HARMONDALE][dialog_menu_id - HOUSE_DIALOGUE_TRANSPORT_SCHEDULE_1]]; 1893 v5 = &transport_schedule[transport_routes[(unsigned int)window_SpeakInHouse->ptr_1C - HOUSE_STABLES_HARMONDALE][dialog_menu_id - HOUSE_DIALOGUE_TRANSPORT_SCHEDULE_1]];
1894 if ( v5->pSchedule[pParty->uDaysPlayed % 7] ) 1894 if ( v5->pSchedule[pParty->uDaysPlayed % 7] )
1895 { 1895 {
1896 if ( _strcmpi(pCurrentMapName, pMapStats->pInfos[v5->uMapInfoID].pFilename) ) 1896 if ( _stricmp(pCurrentMapName, pMapStats->pInfos[v5->uMapInfoID].pFilename) )
1897 { 1897 {
1898 SaveGame(1, 0); 1898 SaveGame(1, 0);
1899 strcpy(pCurrentMapName, pMapStats->pInfos[v5->uMapInfoID].pFilename); 1899 strcpy(pCurrentMapName, pMapStats->pInfos[v5->uMapInfoID].pFilename);
1900 1900
1901 dword_6BE364_game_settings_1 |= 1u; 1901 dword_6BE364_game_settings_1 |= 1u;
2469 pTopic4Height = pFontArrus->CalcTextHeight(pTopic4, &dialog_window, 0, 0); 2469 pTopic4Height = pFontArrus->CalcTextHeight(pTopic4, &dialog_window, 0, 0);
2470 } 2470 }
2471 pNumActiveItem = pDialogueWindow->pStartingPosActiveItem; 2471 pNumActiveItem = pDialogueWindow->pStartingPosActiveItem;
2472 v36 = LOBYTE(pFontArrus->uFontHeight) - 3; 2472 v36 = LOBYTE(pFontArrus->uFontHeight) - 3;
2473 v37 = -pDialogueWindow->pNumPresenceButton < 0; 2473 v37 = -pDialogueWindow->pNumPresenceButton < 0;
2474 if ( !(v37 ^ pNumActiveItem < pNumActiveItem + pDialogueWindow->pNumPresenceButton) ) 2474 if ( !(v37 ^ (pNumActiveItem < pNumActiveItem + pDialogueWindow->pNumPresenceButton)) )
2475 { 2475 {
2476 do 2476 do
2477 { 2477 {
2478 pButton = pDialogueWindow->GetControl(pNumActiveItem); 2478 pButton = pDialogueWindow->GetControl(pNumActiveItem);
2479 if ( pButton->msg_param == 15 ) 2479 if ( pButton->msg_param == 15 )
2881 all_text_height += pFontArrus->CalcTextHeight(pShopOptions[i], &dialog_window, 0, 0); 2881 all_text_height += pFontArrus->CalcTextHeight(pShopOptions[i], &dialog_window, 0, 0);
2882 v103 = (174 - all_text_height) / 4; 2882 v103 = (174 - all_text_height) / 4;
2883 pNumActiveItem = pDialogueWindow->pStartingPosActiveItem; 2883 pNumActiveItem = pDialogueWindow->pStartingPosActiveItem;
2884 v19 = (174 - 4 * (174 - all_text_height) / 4 - all_text_height) / 2 - (174 - all_text_height) / 4 / 2 + 138; 2884 v19 = (174 - 4 * (174 - all_text_height) / 4 - all_text_height) / 2 - (174 - all_text_height) / 4 / 2 + 138;
2885 v20 = -pDialogueWindow->pNumPresenceButton < 0; 2885 v20 = -pDialogueWindow->pNumPresenceButton < 0;
2886 if ( v20 ^ pNumActiveItem > pNumActiveItem + pDialogueWindow->pNumPresenceButton ) 2886 if ( v20 ^ (pNumActiveItem > pNumActiveItem + pDialogueWindow->pNumPresenceButton ))
2887 { 2887 {
2888 pItemNum = 2; 2888 pItemNum = 2;
2889 pNumString = 0; 2889 pNumString = 0;
2890 do 2890 do
2891 { 2891 {
3077 all_text_height += pFontArrus->CalcTextHeight(pShopOptions[i], &dialog_window, 0, 0); 3077 all_text_height += pFontArrus->CalcTextHeight(pShopOptions[i], &dialog_window, 0, 0);
3078 v103 = (174 - all_text_height) / 3; 3078 v103 = (174 - all_text_height) / 3;
3079 pNumActiveItem = pDialogueWindow->pStartingPosActiveItem; 3079 pNumActiveItem = pDialogueWindow->pStartingPosActiveItem;
3080 v70 = (3 * (58 - (signed int)v103) - all_text_height) / 2 - ((174 - all_text_height) / 3) / 2 + 138; 3080 v70 = (3 * (58 - (signed int)v103) - all_text_height) / 2 - ((174 - all_text_height) / 3) / 2 + 138;
3081 v20 = -pDialogueWindow->pNumPresenceButton < 0; 3081 v20 = -pDialogueWindow->pNumPresenceButton < 0;
3082 if ( v20 ^ pNumActiveItem > pNumActiveItem + pDialogueWindow->pNumPresenceButton ) 3082 if ( v20 ^ (pNumActiveItem > pNumActiveItem + pDialogueWindow->pNumPresenceButton ))
3083 { 3083 {
3084 pItemNum = 2; 3084 pItemNum = 2;
3085 pNumString = 0; 3085 pNumString = 0;
3086 do 3086 do
3087 { 3087 {
3411 Str = (174 - all_text_height) / 4; 3411 Str = (174 - all_text_height) / 4;
3412 pNumActiveItem = pDialogueWindow->pStartingPosActiveItem; 3412 pNumActiveItem = pDialogueWindow->pStartingPosActiveItem;
3413 v76 = pNumActiveItem + pDialogueWindow->pNumPresenceButton; 3413 v76 = pNumActiveItem + pDialogueWindow->pNumPresenceButton;
3414 v77 = (174 - 4 * (174 - all_text_height) / 4 - all_text_height) / 2 - (174 - all_text_height) / 4 / 2 + 138; 3414 v77 = (174 - 4 * (174 - all_text_height) / 4 - all_text_height) / 2 - (174 - all_text_height) / 4 / 2 + 138;
3415 v28 = -pDialogueWindow->pNumPresenceButton < 0; 3415 v28 = -pDialogueWindow->pNumPresenceButton < 0;
3416 if ( v28 ^ pNumActiveItem > v76 ) 3416 if ( v28 ^ (pNumActiveItem > v76) )
3417 { 3417 {
3418 pItemNum = 2; 3418 pItemNum = 2;
3419 pNumString = 0; 3419 pNumString = 0;
3420 do 3420 do
3421 { 3421 {
3611 Str = (174 - all_text_height) / 2; 3611 Str = (174 - all_text_height) / 2;
3612 pNumActiveItem = pDialogueWindow->pStartingPosActiveItem; 3612 pNumActiveItem = pDialogueWindow->pStartingPosActiveItem;
3613 v26 = pNumActiveItem + pDialogueWindow->pNumPresenceButton; 3613 v26 = pNumActiveItem + pDialogueWindow->pNumPresenceButton;
3614 v27 = (2 * (87 - (174 - all_text_height) / 2) - all_text_height) / 2 - (174 - all_text_height) / 2 / 2 + 138; 3614 v27 = (2 * (87 - (174 - all_text_height) / 2) - all_text_height) / 2 - (174 - all_text_height) / 2 / 2 + 138;
3615 v28 = -pDialogueWindow->pNumPresenceButton < 0; 3615 v28 = -pDialogueWindow->pNumPresenceButton < 0;
3616 if ( v28 ^ pNumActiveItem > v26 ) 3616 if ( v28 ^ (pNumActiveItem > v26) )
3617 { 3617 {
3618 pItemNum = 2; 3618 pItemNum = 2;
3619 pNumString = 0; 3619 pNumString = 0;
3620 do 3620 do
3621 { 3621 {
4165 all_text_height += pFontArrus->CalcTextHeight(pShopOptions[i], &dialog_window, 0, 0); 4165 all_text_height += pFontArrus->CalcTextHeight(pShopOptions[i], &dialog_window, 0, 0);
4166 v152 = (174 - all_text_height) / 3; 4166 v152 = (174 - all_text_height) / 3;
4167 v86 = (3 * (58 - v152) - all_text_height) / 2 - v152 / 2 + 138; 4167 v86 = (3 * (58 - v152) - all_text_height) / 2 - v152 / 2 + 138;
4168 v24 = -pDialogueWindow->pNumPresenceButton < 0; 4168 v24 = -pDialogueWindow->pNumPresenceButton < 0;
4169 pActiveButton = pDialogueWindow->pStartingPosActiveItem; 4169 pActiveButton = pDialogueWindow->pStartingPosActiveItem;
4170 if ( v24 ^ pDialogueWindow->pStartingPosActiveItem > pDialogueWindow->pStartingPosActiveItem + pDialogueWindow->pNumPresenceButton ) 4170 if ( v24 ^ (pDialogueWindow->pStartingPosActiveItem > pDialogueWindow->pStartingPosActiveItem + pDialogueWindow->pNumPresenceButton) )
4171 { 4171 {
4172 pNumString = 0; 4172 pNumString = 0;
4173 do 4173 do
4174 { 4174 {
4175 pButton = pDialogueWindow->GetControl((unsigned int)pActiveButton); 4175 pButton = pDialogueWindow->GetControl((unsigned int)pActiveButton);
5895 all_text_height += pFontArrus->CalcTextHeight(pShopOptions[i], &dialog_window, 0, 0); 5895 all_text_height += pFontArrus->CalcTextHeight(pShopOptions[i], &dialog_window, 0, 0);
5896 _this = ((174 - all_text_height) / 3); 5896 _this = ((174 - all_text_height) / 3);
5897 v81 = (3 * (58 - (signed int)_this) - all_text_height) / 2 - (174 - all_text_height) / 3 / 2 + 138; 5897 v81 = (3 * (58 - (signed int)_this) - all_text_height) / 2 - (174 - all_text_height) / 3 / 2 + 138;
5898 v20 = -pDialogueWindow->pNumPresenceButton < 0; 5898 v20 = -pDialogueWindow->pNumPresenceButton < 0;
5899 v118 = pDialogueWindow->pStartingPosActiveItem; 5899 v118 = pDialogueWindow->pStartingPosActiveItem;
5900 if ( v20 ^ pDialogueWindow->pStartingPosActiveItem > pDialogueWindow->pStartingPosActiveItem + pDialogueWindow->pNumPresenceButton ) 5900 if ( v20 ^ (pDialogueWindow->pStartingPosActiveItem > pDialogueWindow->pStartingPosActiveItem + pDialogueWindow->pNumPresenceButton) )
5901 { 5901 {
5902 v122 = 2; 5902 v122 = 2;
5903 pSrtingNum = 0; 5903 pSrtingNum = 0;
5904 do 5904 do
5905 { 5905 {