Mercurial > mm7

comparison UI/UiGame.cpp @ 1423:350959f13283

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Tue, 30 Jul 2013 09:34:14 +0600
parents 110eac219e5a
children 934074e7fcc1
comparison
equal deleted inserted replaced
1422:6bbcb91b3b7d 1423:350959f13283
285 } 285 }
286 v13 = TargetColor(0xFFu, 0xFFu, 0x9Bu); 286 v13 = TargetColor(0xFFu, 0xFFu, 0x9Bu);
287 a1.DrawTitleText(pFontArrus, 0, 0xCu, v13, v11, 3u); 287 a1.DrawTitleText(pFontArrus, 0, 0xCu, v13, v11, 3u);
288 a1.uFrameWidth -= 24; 288 a1.uFrameWidth -= 24;
289 a1.uFrameZ = a1.uFrameX + a1.uFrameWidth - 1; 289 a1.uFrameZ = a1.uFrameX + a1.uFrameWidth - 1;
290 v14 = BuilDialogueString((char *)lpsz, uActiveCharacter - 1, 0, 0, 0, 0); 290 v14 = BuildDialogueString((char *)lpsz, uActiveCharacter - 1, 0, 0, 0, 0);
291 a1.DrawText(pFontArrus, 100, 36, 0, v14, 0, 0, 0); 291 a1.DrawText(pFontArrus, 100, 36, 0, v14, 0, 0, 0);
292 } 292 }
293 } 293 }
294 } 294 }
295 } 295 }
479 479
480 pInString = nullptr; 480 pInString = nullptr;
481 switch (uDialogueType) 481 switch (uDialogueType)
482 { 482 {
483 case DIALOGUE_13: 483 case DIALOGUE_13:
484 pInString = BuilDialogueString(pNPCStats->pProfessions[pNPC->uProfession - 1].pJoinText, uActiveCharacter - 1, 0, 0, 0, 0); 484 pInString = BuildDialogueString(pNPCStats->pProfessions[pNPC->uProfession - 1].pJoinText, uActiveCharacter - 1, 0, 0, 0, 0);
485 break; 485 break;
486 486
487 case DIALOGUE_PROFESSION_DETAILS: 487 case DIALOGUE_PROFESSION_DETAILS:
488 { 488 {
489 auto prof = pNPCStats->pProfessions + pNPC->uProfession - 1; 489 auto prof = pNPCStats->pProfessions + pNPC->uProfession - 1;
490 490
491 if (dialogue_show_profession_details) 491 if (dialogue_show_profession_details)
492 pInString = BuilDialogueString(prof->pBenefits, uActiveCharacter - 1, 0, 0, 0, 0); 492 pInString = BuildDialogueString(prof->pBenefits, uActiveCharacter - 1, 0, 0, 0, 0);
493 else if (pNPC->Hired()) 493 else if (pNPC->Hired())
494 pInString = BuilDialogueString(prof->pDismissText, uActiveCharacter - 1, 0, 0, 0, 0); 494 pInString = BuildDialogueString(prof->pDismissText, uActiveCharacter - 1, 0, 0, 0, 0);
495 else 495 else
496 pInString = BuilDialogueString(prof->pJoinText, uActiveCharacter - 1, 0, 0, 0, 0); 496 pInString = BuildDialogueString(prof->pJoinText, uActiveCharacter - 1, 0, 0, 0, 0);
497 } 497 }
498 break; 498 break;
499 499
500 500
501 case DIALOGUE_ARENA_WELCOME: 501 case DIALOGUE_ARENA_WELCOME:
533 else if (pGreetType == 2)//HiredNPC_greet 533 else if (pGreetType == 2)//HiredNPC_greet
534 { 534 {
535 auto prof = pNPCStats->pProfessions + pNPC->uProfession - 1; 535 auto prof = pNPCStats->pProfessions + pNPC->uProfession - 1;
536 536
537 if (pNPC->Hired()) 537 if (pNPC->Hired())
538 pInString = BuilDialogueString(prof->pDismissText, uActiveCharacter - 1, 0, 0, 0, 0); 538 pInString = BuildDialogueString(prof->pDismissText, uActiveCharacter - 1, 0, 0, 0, 0);
539 else 539 else
540 pInString = BuilDialogueString(prof->pJoinText, uActiveCharacter - 1, 0, 0, 0, 0); 540 pInString = BuildDialogueString(prof->pJoinText, uActiveCharacter - 1, 0, 0, 0, 0);
541 } 541 }
542 break; 542 break;
543 } 543 }
544 544
545 if (pInString) 545 if (pInString)
1899 } 1899 }
1900 if ( uNumVisibleWindows <= 0 || (uNumVisibleWindows > 0 && pWindow->uFrameHeight != 480 && v1 <= 0)) 1900 if ( uNumVisibleWindows <= 0 || (uNumVisibleWindows > 0 && pWindow->uFrameHeight != 480 && v1 <= 0))
1901 { 1901 {
1902 if ( pCurrentScreen == SCREEN_CHEST ) 1902 if ( pCurrentScreen == SCREEN_CHEST )
1903 { 1903 {
1904 sub_42038D(); 1904 ChestUI_WritePointedObjectStatusString();
1905 //goto _return; 1905 //goto _return;
1906 if ( pMouse->uPointingObjectID == 0 ) 1906 if ( pMouse->uPointingObjectID == 0 )
1907 { 1907 {
1908 if ( uLastPointedObjectID != 0 ) 1908 if ( uLastPointedObjectID != 0 )
1909 { 1909 {