Mercurial > mm7

diff 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
line wrap: on
line diff
--- a/UI/UIHouses.cpp	Sat Aug 03 00:00:10 2013 +0600
+++ b/UI/UIHouses.cpp	Sat Aug 03 00:00:31 2013 +0600
@@ -553,7 +553,22 @@
       pDialogueWindow->_41D08F_set_keyboard_control_group(2, 1, 0, 2);
     }
     break;
-    
+
+    case BuildingType_Tavern:
+    {
+      CreateButtonInColumn(0, 0xFu);
+      CreateButtonInColumn(1, 0x10u);
+      CreateButtonInColumn(2, 0x60u);
+      if ( (signed int)window_SpeakInHouse->ptr_1C < 108 || (signed int)window_SpeakInHouse->ptr_1C > 120 )
+      {
+        pDialogueWindow->_41D08F_set_keyboard_control_group(3, 1, 0, 2);
+        break;
+      }
+      CreateButtonInColumn(3, 101);
+      pDialogueWindow->_41D08F_set_keyboard_control_group(4, 1, 0, 2);
+    }
+    break;
+
     case BuildingType_18:
     case BuildingType_19:
     case BuildingType_Throne_Room: