Mercurial > mm7

comparison mm7_5.cpp @ 659:c10163a6d946

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
NPC hiring fixed
author zipi
date Tue, 12 Mar 2013 23:11:11 +0000
parents 7747161ea5b5
children a5750c94b022
comparison
equal deleted inserted replaced
658:cec42951eda0 659:c10163a6d946
1365 pVideoPlayer->Unload(); 1365 pVideoPlayer->Unload();
1366 if ( dword_5B65CC ) 1366 if ( dword_5B65CC )
1367 { 1367 {
1368 pParty->field_709 = 0; 1368 pParty->field_709 = 0;
1369 LOBYTE(pNPCStats->pNewNPCData[dword_5B65CC].uFlags) &= 0x7Fu; 1369 LOBYTE(pNPCStats->pNewNPCData[dword_5B65CC].uFlags) &= 0x7Fu;
1370 sub_44A56A(); 1370 Party__CountHirelings();
1371 viewparams->bRedrawGameUI = v0; 1371 viewparams->bRedrawGameUI = v0;
1372 dword_5B65CC = 0; 1372 dword_5B65CC = 0;
1373 } 1373 }
1374 goto LABEL_317; 1374 goto LABEL_317;
1375 case SCREEN_NPC_DIALOGUE: 1375 case SCREEN_NPC_DIALOGUE:
1376 if ( dword_5B65CC ) 1376 if ( dword_5B65CC )
1377 { 1377 {
1378 pParty->field_709 = 0; 1378 pParty->field_709 = 0;
1379 LOBYTE(pNPCStats->pNewNPCData[dword_5B65CC].uFlags) &= 0x7Fu; 1379 LOBYTE(pNPCStats->pNewNPCData[dword_5B65CC].uFlags) &= 0x7Fu;
1380 sub_44A56A(); 1380 Party__CountHirelings();
1381 viewparams->bRedrawGameUI = v0; 1381 viewparams->bRedrawGameUI = v0;
1382 dword_5B65CC = 0; 1382 dword_5B65CC = 0;
1383 } 1383 }
1384 goto LABEL_317; 1384 goto LABEL_317;
1385 case SCREEN_BRANCHLESS_NPC_DIALOG: 1385 case SCREEN_BRANCHLESS_NPC_DIALOG: