Mercurial > mm7

comparison NPC.cpp @ 1410:38df78aba732

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
deleted stru220.h and stru220 (bezier terrain stuff) stru167 -> TrailParticle stru167warp -> TrailParticleGenerator
author Nomad
date Fri, 26 Jul 2013 22:19:29 +0200
parents ae6c8e1ddef4
children 2423bc2af692
comparison
equal deleted inserted replaced
1409:c9e3b93ec570 1410:38df78aba732
1310 { 1310 {
1311 switch ( uMessageParam ) 1311 switch ( uMessageParam )
1312 { 1312 {
1313 case 13: 1313 case 13:
1314 current_npc_text = pNPCStats->pProfessions[pCurrentNPCInfo->uProfession].pJoinText;//(char *)*(&pNPCStats->field_13A64 + 5 * v2->uProfession); 1314 current_npc_text = pNPCStats->pProfessions[pCurrentNPCInfo->uProfession].pJoinText;//(char *)*(&pNPCStats->field_13A64 + 5 * v2->uProfession);
1315 current_npc_text = BuilDialogueString((char *)current_npc_text, uActiveCharacter - 1, 0, 0, 0, 0); 1315 current_npc_text = BuildDialogueString((char *)current_npc_text, uActiveCharacter - 1, 0, 0, 0, 0);
1316 NPCHireableDialogPrepare(); 1316 NPCHireableDialogPrepare();
1317 dialogue_show_profession_details = false; 1317 dialogue_show_profession_details = false;
1318 goto _return; 1318 goto _return;
1319 case 19: 1319 case 19:
1320 pEventNumber = pCurrentNPCInfo->evt_A; 1320 pEventNumber = pCurrentNPCInfo->evt_A;
1389 if (dialogue_show_profession_details) 1389 if (dialogue_show_profession_details)
1390 v17 = pNPCStats->pProfessions[pCurrentNPCInfo->uProfession - 1].pJoinText; 1390 v17 = pNPCStats->pProfessions[pCurrentNPCInfo->uProfession - 1].pJoinText;
1391 else 1391 else
1392 v17 = pNPCStats->pProfessions[pCurrentNPCInfo->uProfession - 1].pBenefits; 1392 v17 = pNPCStats->pProfessions[pCurrentNPCInfo->uProfession - 1].pBenefits;
1393 current_npc_text = v17; 1393 current_npc_text = v17;
1394 v18 = BuilDialogueString(v17, uActiveCharacter - 1, 0, 0, 0, 0); 1394 v18 = BuildDialogueString(v17, uActiveCharacter - 1, 0, 0, 0, 0);
1395 dialogue_show_profession_details = ~dialogue_show_profession_details; 1395 dialogue_show_profession_details = ~dialogue_show_profession_details;
1396 current_npc_text = v18; 1396 current_npc_text = v18;
1397 } 1397 }
1398 else 1398 else
1399 { 1399 {
1509 { 1509 {
1510 ShowStatusBarString(pGlobalTXT_LocalizationStrings[155], 2); 1510 ShowStatusBarString(pGlobalTXT_LocalizationStrings[155], 2);
1511 dialogue_show_profession_details = false; 1511 dialogue_show_profession_details = false;
1512 uDialogueType = 13; 1512 uDialogueType = 13;
1513 current_npc_text = pNPCStats->pProfessions[pCurrentNPCInfo->uProfession - 1].pJoinText; 1513 current_npc_text = pNPCStats->pProfessions[pCurrentNPCInfo->uProfession - 1].pJoinText;
1514 current_npc_text = BuilDialogueString((char *)current_npc_text, uActiveCharacter - 1, 0, 0, 0, 0); 1514 current_npc_text = BuildDialogueString((char *)current_npc_text, uActiveCharacter - 1, 0, 0, 0, 0);
1515 if ( uActiveCharacter ) 1515 if ( uActiveCharacter )
1516 pPlayers[uActiveCharacter]->PlaySound(SPEECH_NotEnoughGold, 0); 1516 pPlayers[uActiveCharacter]->PlaySound(SPEECH_NotEnoughGold, 0);
1517 ShowStatusBarString(pGlobalTXT_LocalizationStrings[155], 2); 1517 ShowStatusBarString(pGlobalTXT_LocalizationStrings[155], 2);
1518 goto _return; 1518 goto _return;
1519 } 1519 }