Mercurial > mm7

comparison UI/UiGame.cpp @ 1661:e1d1fe32c194

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
NPCTopics
author Ritor1
date Wed, 18 Sep 2013 14:19:37 +0600
parents d453ed393d6e
children 620b6ba3e6b8
comparison
equal deleted inserted replaced
1654:d11b5669f089 1661:e1d1fe32c194
393 pInString = BuildDialogueString(pNPCStats->pProfessions[pNPC->uProfession - 1].pJoinText, uActiveCharacter - 1, 0, 0, 0, 0); 393 pInString = BuildDialogueString(pNPCStats->pProfessions[pNPC->uProfession - 1].pJoinText, uActiveCharacter - 1, 0, 0, 0, 0);
394 break; 394 break;
395 395
396 case DIALOGUE_PROFESSION_DETAILS: 396 case DIALOGUE_PROFESSION_DETAILS:
397 { 397 {
398 auto prof = pNPCStats->pProfessions + pNPC->uProfession - 1; 398 //auto prof = pNPCStats->pProfessions[pNPC->uProfession];
399 399
400 if (dialogue_show_profession_details) 400 if (dialogue_show_profession_details)
401 pInString = BuildDialogueString(prof->pBenefits, uActiveCharacter - 1, 0, 0, 0, 0); 401 pInString = BuildDialogueString(pNPCStats->pProfessions[pNPC->uProfession].pBenefits, uActiveCharacter - 1, 0, 0, 0, 0);
402 else if (pNPC->Hired()) 402 else if (pNPC->Hired())
403 pInString = BuildDialogueString(prof->pDismissText, uActiveCharacter - 1, 0, 0, 0, 0); 403 pInString = BuildDialogueString(pNPCStats->pProfessions[pNPC->uProfession].pDismissText, uActiveCharacter - 1, 0, 0, 0, 0);
404 else 404 else
405 pInString = BuildDialogueString(prof->pJoinText, uActiveCharacter - 1, 0, 0, 0, 0); 405 pInString = BuildDialogueString(pNPCStats->pProfessions[pNPC->uProfession].pJoinText, uActiveCharacter - 1, 0, 0, 0, 0);
406 } 406 }
407 break; 407 break;
408 408
409 409
410 case DIALOGUE_ARENA_WELCOME: 410 case DIALOGUE_ARENA_WELCOME: