Mercurial > mm7

diff mm7_4.cpp @ 2247:529bf95fb0d7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Grumpy7
date Wed, 26 Feb 2014 01:15:58 +0100
parents 0be4f17b7986 8817c398b792
children 708aa31cad56
line wrap: on
line diff
--- a/mm7_4.cpp	Wed Feb 26 01:14:18 2014 +0100
+++ b/mm7_4.cpp	Wed Feb 26 01:15:58 2014 +0100
@@ -2130,7 +2130,7 @@
 {
   const char *v2; // edi@1
 
-  __debugbreak();
+  //__debugbreak();
   uDialogueType = DIALOGUE_SKILL_TRAINER;
   current_npc_text = (char *)pNPCTopics[a4 + 168].pText;
   _4B254D_SkillMasteryTeacher(a4);  //might be needed because of contract_approved ?
@@ -2142,7 +2142,7 @@
   v2 = "";
   if ( contract_approved )
     v2 = pGlobalTXT_LocalizationStrings[535];
-  pDialogueWindow->CreateButton(0x1E0u, 0xA0u, 0x8Cu, 0x1Eu, 1, 0, UIMSG_ClickNPCTopic, 0x4Fu, 0, v2, 0);
+  pDialogueWindow->CreateButton(480, 160, 0x8Cu, 0x1Eu, 1, 0, UIMSG_ClickNPCTopic, 0x4Fu, 0, v2, 0);
   pDialogueWindow->_41D08F_set_keyboard_control_group(1, 1, 0, 2);
   dialog_menu_id = HOUSE_DIALOGUE_OTHER;
 }