Mercurial > mm7

comparison UI/UiGame.cpp @ 1666:5302a9811767

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
MainMenuUI_Create() cleared
author Ritor1
date Wed, 18 Sep 2013 16:20:15 +0600
parents 620b6ba3e6b8
children f3986fd1a122
comparison
equal deleted inserted replaced
1665:5dd790bb52bf 1666:5302a9811767
346 NPCData *pNPC; // ebx@2 346 NPCData *pNPC; // ebx@2
347 int pGreetType; // eax@2 347 int pGreetType; // eax@2
348 int pTextHeight; // esi@39 348 int pTextHeight; // esi@39
349 GUIButton *pButton; // eax@43 349 GUIButton *pButton; // eax@43
350 int v32; // ebx@93 350 int v32; // ebx@93
351 //uint v35; // esi@93
352 int v38; // eax@95 351 int v38; // eax@95
353 signed int v39; // esi@99 352 signed int v39; // esi@99
354 signed int v40; // eax@102 353 signed int v40; // eax@102
355 unsigned int v41; // ebx@102 354 unsigned int v41; // ebx@102
356 int v42; // edi@102 355 int v42; // edi@102
388 387
389 pInString = nullptr; 388 pInString = nullptr;
390 switch (uDialogueType) 389 switch (uDialogueType)
391 { 390 {
392 case DIALOGUE_13: 391 case DIALOGUE_13:
393 pInString = BuildDialogueString(pNPCStats->pProfessions[pNPC->uProfession - 1].pJoinText, uActiveCharacter - 1, 0, 0, 0, 0); 392 pInString = BuildDialogueString(pNPCStats->pProfessions[pNPC->uProfession].pJoinText, uActiveCharacter - 1, 0, 0, 0, 0);
394 break; 393 break;
395 394
396 case DIALOGUE_PROFESSION_DETAILS: 395 case DIALOGUE_PROFESSION_DETAILS:
397 { 396 {
398 //auto prof = pNPCStats->pProfessions[pNPC->uProfession]; 397 //auto prof = pNPCStats->pProfessions[pNPC->uProfession];