--- a/mm7_4.cpp	Mon May 13 09:39:49 2013 +0600
+++ b/mm7_4.cpp	Mon May 13 09:39:58 2013 +0600
@@ -2794,7 +2794,7 @@
 LABEL_135:
     if ( pCurrentScreen != SCREEN_REST
       && (!v51 || dword_5C35C0) )
-      uGameState = 8;
+      uGameState = GAME_STATE_PARTY_DIED;
   }
   if ( uActiveCharacter )
   {
@@ -7351,11 +7351,9 @@
         pInString = (char *)*(&pNPCStats->field_17884 + ((v10 & 3) == 2) + 2 * v9);
         v11 = pFontArrus->CalcTextHeight(pInString, &a1, 13, 0);
         v12 = v11 + 7;
-        pRenderer->_4A6A68(
-          8u,
-          352 - (v11 + 7),
-          (Texture *)(uTextureID_Leather != -1 ? &pIcons_LOD->pTextures[uTextureID_Leather] : 0),
-          (uTextureID_Leather != -1 ? pIcons_LOD->pTextures[uTextureID_Leather].uTextureHeight : 26) - (v11 + 7));
+        pRenderer->_4A6A68(8, 352 - (v11 + 7),
+          pIcons_LOD->GetTexture(uTextureID_Leather),
+          pIcons_LOD->GetTexture(uTextureID_Leather)->uTextureHeight - (v11 + 7));
         pRenderer->DrawTextureIndexed(8u, 347 - v12, pTexture_591428);
         v13 = FitTextInAWindow(pInString, pFontArrus, &a1, 0xDu, 0);
         pDialogueWindow->DrawText(pFontArrus, 13, 354 - v12, 0, v13, 0, 0, 0);
@@ -7556,11 +7554,9 @@
       v47 = pFontCreate;
       v48 = pFontCreate->CalcTextHeight(current_npc_text, &w, 13, 0) + 7;
     }
-    pRenderer->_4A6A68(
-      8u,
-      352 - v48,
-      (Texture *)(uTextureID_Leather != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_Leather] : 0),
-      (uTextureID_Leather != -1 ? pIcons_LOD->pTextures[uTextureID_Leather].uTextureHeight : 26) - v48);
+    pRenderer->_4A6A68(8, 352 - v48,
+      pIcons_LOD->GetTexture(uTextureID_Leather),
+      pIcons_LOD->GetTexture(uTextureID_Leather)->uTextureHeight - v48);
     pRenderer->DrawTextureIndexed(8u, 347 - v48, pTexture_591428);
     v49 = FitTextInAWindow(current_npc_text, v47, &w, 0xDu, 0);
     a1.DrawText(v47, 13, 354 - v48, 0, v49, 0, 0, 0);
@@ -7590,7 +7586,7 @@
       CreateButtonInColumn(2, 0x68u);
     }
   }
-  pDialogueWindow->_41D08F(num_buttons, 1, 0, 2);
+  pDialogueWindow->_41D08F_set_keyboard_control_group(num_buttons, 1, 0, 2);
   dword_F8B1E0 = pDialogueWindow->pNumPresenceButton;
 }
 // F8B1E0: using guessed type int dword_F8B1E0;
@@ -7605,13 +7601,13 @@
       CreateButtonInColumn(0, 3u);
       CreateButtonInColumn(1, 4u);
       CreateButtonInColumn(2, 5u);
-       pDialogueWindow->_41D08F(3, 1, 0, 2);
+       pDialogueWindow->_41D08F_set_keyboard_control_group(3, 1, 0, 2);
     }
     if ( a1 == 4 )
     {
       CreateButtonInColumn(0, 3u);
       CreateButtonInColumn(1, 4u);
-      pDialogueWindow->_41D08F(2, 1, 0, 2);
+      pDialogueWindow->_41D08F_set_keyboard_control_group(2, 1, 0, 2);
     }
   }
   dword_F8B1E0 = pDialogueWindow->pNumPresenceButton;
@@ -7724,7 +7720,7 @@
             v10 = 1;
             v9 = v4;
 LABEL_42:
-            pDialogueWindow->_41D08F(v9, v10, v11, v17);
+            pDialogueWindow->_41D08F_set_keyboard_control_group(v9, v10, v11, v17);
             goto LABEL_43;
           }
           v4 = 2;
@@ -7835,7 +7831,7 @@
     v1 = 1;
   }
   pDialogueWindow->CreateButton(480, 30 * v1 + 160, 140, 30, 1, 0, UIMSG_SelectNPCDialogueOption, 76, 0, pGlobalTXT_LocalizationStrings[406], 0);//������
-  pDialogueWindow->_41D08F(v1 + 1, 1, 0, 1);
+  pDialogueWindow->_41D08F_set_keyboard_control_group(v1 + 1, 1, 0, 1);
 }
 
 //----- (004B3EF0) --------------------------------------------------------
@@ -7849,7 +7845,7 @@
   pBtn_ExitCancel = pDialogueWindow->CreateButton(471, 445, 169, 35, 1, 0, UIMSG_Escape,                    0, 0, pGlobalTXT_LocalizationStrings[34], pIcons_LOD->GetTexture(uExitCancelTextureId), 0); // Cancel
                     pDialogueWindow->CreateButton(  0,   0,   0,  0, 1, 0, UIMSG_BuyInShop_Identify_Repair, 0, 0, "", 0);
                     pDialogueWindow->CreateButton(480, 160, 140, 30, 1, 0, UIMSG_ClickNPCTopic,             0x52u, 0, pGlobalTXT_LocalizationStrings[122], 0);
-  pDialogueWindow->_41D08F(1, 1, 0, 2);
+  pDialogueWindow->_41D08F_set_keyboard_control_group(1, 1, 0, 2);
   dialog_menu_id = HOUSE_DIALOGUE_OTHER;
 }
 // F8B19C: using guessed type int dword_F8B19C;
@@ -7873,7 +7869,7 @@
   if ( contract_approved )
     v2 = pGlobalTXT_LocalizationStrings[535];
   pDialogueWindow->CreateButton(0x1E0u, 0xA0u, 0x8Cu, 0x1Eu, 1, 0, UIMSG_ClickNPCTopic, 0x4Fu, 0, v2, 0);
-  pDialogueWindow->_41D08F(1, 1, 0, 2);
+  pDialogueWindow->_41D08F_set_keyboard_control_group(1, 1, 0, 2);
   dialog_menu_id = HOUSE_DIALOGUE_OTHER;
 }
 // F8B19C: using guessed type int dword_F8B19C;
@@ -7902,7 +7898,7 @@
   }
   pDialogueWindow->CreateButton(  0x1E0u,  30 * v0 + 160,  0x8Cu,  0x1Eu,  1,  0,  UIMSG_ClickNPCTopic,  0x4Cu,  0,
     pGlobalTXT_LocalizationStrings[406],  0); //"Hire"
-  pDialogueWindow->_41D08F(v0 + 1, 1, 0, 2);
+  pDialogueWindow->_41D08F_set_keyboard_control_group(v0 + 1, 1, 0, 2);
   dialog_menu_id = HOUSE_DIALOGUE_OTHER;
 }
 
@@ -8015,7 +8011,7 @@
             pDialogueWindow->CreateButton( 0x1E0u, 30 * num_menu_buttons++ + 160,  0x8Cu,  0x1Eu, 1, 0, UIMSG_ClickNPCTopic, 0x18u, 0, "",  0);
         }
       }
-      pDialogueWindow->_41D08F(num_menu_buttons, 1, 0, 2);
+      pDialogueWindow->_41D08F_set_keyboard_control_group(num_menu_buttons, 1, 0, 2);
       dword_F8B1E0 = pDialogueWindow->pNumPresenceButton;
     }
     dialog_menu_id = HOUSE_DIALOGUE_MAIN;