Mercurial > mm7

comparison UI/UiGame.cpp @ 2115:90cc547a7927

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixing hireling prices
author Grumpy7
date Mon, 23 Dec 2013 15:17:50 +0100
parents 0db53678ff48
children 92511cd8fcdb
comparison
equal deleted inserted replaced
2109:4fae5a167a05 2115:90cc547a7927
308 } 308 }
309 } 309 }
310 } 310 }
311 if (sDialogue_SpeakingActorNPC_ID < 0) 311 if (sDialogue_SpeakingActorNPC_ID < 0)
312 v9 = 4; 312 v9 = 4;
313 pDialogueWindow = GUIWindow::Create(0, 0, 640, 480, WINDOW_Dialogue, v9, 0);//pNumberContacts = 1, v9 = 0; pNumberContacts = 2, v9 = 3; 313 pDialogueWindow = GUIWindow::Create(0, 0, 640, 480, WINDOW_Dialogue, 3, 0);//pNumberContacts = 1, v9 = 0; pNumberContacts = 2, v9 = 3;
314 if (pNPCInfo->Hired()) 314 if (pNPCInfo->Hired() && !pNPCInfo->bHasUsedTheAbility)
315 { 315 {
316 if ( !pNPCInfo->bHasUsedTheAbility ) 316 if (pNPCInfo->uProfession == 10 || //Healer
317 { 317 pNPCInfo->uProfession == 11 || //Expert Healer
318 if ( pNPCInfo->uProfession >= 10 ) 318 pNPCInfo->uProfession == 12 || //Master Healer
319 { 319 pNPCInfo->uProfession == 33 || //Cook
320 if ( pNPCInfo->uProfession <= 12 || pNPCInfo->uProfession > 32 && (pNPCInfo->uProfession <= 34 320 pNPCInfo->uProfession == 34 || //Chef
321 || pNPCInfo->uProfession > 38 && (pNPCInfo->uProfession <= 43 || pNPCInfo->uProfession == 52)) ) 321 pNPCInfo->uProfession == 39 || //Wind Master
322 { 322 pNPCInfo->uProfession == 40 || //Water Master
323 pDialogueWindow->CreateButton(480, 250, 140, LOBYTE(pFontArrus->uFontHeight) - 3, 1, 0, UIMSG_SelectNPCDialogueOption, 9, 0, "", 0); 323 pNPCInfo->uProfession == 41 || //Gate Master
324 pDialogueWindow->_41D08F_set_keyboard_control_group(4, 1, 0, 1); 324 pNPCInfo->uProfession == 42 || //Chaplain
325 } 325 pNPCInfo->uProfession == 43 || //Piper
326 } 326 pNPCInfo->uProfession == 52 //Fallen Wizard
327 )
328 {
329 pDialogueWindow->CreateButton(480, 250, 140, LOBYTE(pFontArrus->uFontHeight) - 3, 1, 0, UIMSG_SelectNPCDialogueOption, 9, 0, "", 0);
330 pDialogueWindow->_41D08F_set_keyboard_control_group(4, 1, 0, 1);
327 } 331 }
328 } 332 }
329 333
330 pDialogueWindow->CreateButton( 61, 424, 31, 40, 2, 94, UIMSG_SelectCharacter, 1, '1', "", 0); 334 pDialogueWindow->CreateButton( 61, 424, 31, 40, 2, 94, UIMSG_SelectCharacter, 1, '1', "", 0);
331 pDialogueWindow->CreateButton(177, 424, 31, 40, 2, 94, UIMSG_SelectCharacter, 2, '2', "", 0); 335 pDialogueWindow->CreateButton(177, 424, 31, 40, 2, 94, UIMSG_SelectCharacter, 2, '2', "", 0);