Mercurial > mm7

comparison mm7_1.cpp @ 298:055cea8660e5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Tue, 19 Feb 2013 09:14:16 +0600
parents 0ea5fbd16edb
children 3dcc9d945eeb
comparison
equal deleted inserted replaced
297:ada52edca264 298:055cea8660e5
4776 v12 = &pNPCStats->pNPCData[v11 + 499]; 4776 v12 = &pNPCStats->pNPCData[v11 + 499];
4777 if ( (unsigned __int8)pTmpBuf[v2] < 2 ) 4777 if ( (unsigned __int8)pTmpBuf[v2] < 2 )
4778 v12 = &pParty->pHirelings[v11]; 4778 v12 = &pParty->pHirelings[v11];
4779 v13 = v12->uProfession; 4779 v13 = v12->uProfession;
4780 if ( v13 ) 4780 if ( v13 )
4781 v3 += *(&pNPCStats->field_13A58 + 5 * v13); 4781 v3 += pNPCStats->pProfessions[v13].uHirePrice;//*(&pNPCStats->field_13A58 + 5 * v13);
4782 ++v2; 4782 ++v2;
4783 } 4783 }
4784 while ( (signed int)v2 < v14 ); 4784 while ( (signed int)v2 < v14 );
4785 } 4785 }
4786 if ( CheckHiredNPCSpeciality(0x1Fu) ) 4786 if ( CheckHiredNPCSpeciality(0x1Fu) )