Mercurial > mm7

comparison UI/UIHouses.cpp @ 1445:6de9c1316852

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Sat, 03 Aug 2013 00:00:31 +0600
parents b67a3e0d6fc3 c7489dd19f88
children 934074e7fcc1 ff2118028c71
comparison
equal deleted inserted replaced
1444:7b1a94270756 1445:6de9c1316852
551 CreateButtonInColumn(0, 17); 551 CreateButtonInColumn(0, 17);
552 CreateButtonInColumn(1, 96); 552 CreateButtonInColumn(1, 96);
553 pDialogueWindow->_41D08F_set_keyboard_control_group(2, 1, 0, 2); 553 pDialogueWindow->_41D08F_set_keyboard_control_group(2, 1, 0, 2);
554 } 554 }
555 break; 555 break;
556 556
557 case BuildingType_Tavern:
558 {
559 CreateButtonInColumn(0, 0xFu);
560 CreateButtonInColumn(1, 0x10u);
561 CreateButtonInColumn(2, 0x60u);
562 if ( (signed int)window_SpeakInHouse->ptr_1C < 108 || (signed int)window_SpeakInHouse->ptr_1C > 120 )
563 {
564 pDialogueWindow->_41D08F_set_keyboard_control_group(3, 1, 0, 2);
565 break;
566 }
567 CreateButtonInColumn(3, 101);
568 pDialogueWindow->_41D08F_set_keyboard_control_group(4, 1, 0, 2);
569 }
570 break;
571
557 case BuildingType_18: 572 case BuildingType_18:
558 case BuildingType_19: 573 case BuildingType_19:
559 case BuildingType_Throne_Room: 574 case BuildingType_Throne_Room:
560 case BuildingType_24: 575 case BuildingType_24:
561 case BuildingType_Unic: 576 case BuildingType_Unic: