Mercurial > mm7

comparison mm7_4.cpp @ 66:653fdf29c654

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
23.01.13 (work)
author Ritor1
date Wed, 23 Jan 2013 17:29:00 +0600
parents ac65389dc211
children 377535d6e366 ec84db4c8f9d
comparison
equal deleted inserted replaced
65:31feb3432bbd 66:653fdf29c654
3078 3078
3079 if ( bNoNPCHiring != 1 ) 3079 if ( bNoNPCHiring != 1 )
3080 { 3080 {
3081 v23 = 0; 3081 v23 = 0;
3082 v22 = 0; 3082 v22 = 0;
3083 for (uint i = 0; i < 2; ++i) 3083 /*for (uint i = 0; i < 2; ++i)
3084 { 3084 {
3085 if (pParty->pHirelings[i].pName) 3085 if (pParty->pHirelings[i].pName)
3086 pTmpBuf[v22++] = i; 3086 pTmpBuf[v22++] = i;
3087 } 3087 }*/
3088 if (pParty->pHirelings[0].pName)
3089 pTmpBuf[v22++] = 0;
3090 if (pParty->pHirelings[1].pName)
3091 pTmpBuf[v22++] = 1;
3088 3092
3089 for (uint i = 0; i < pNPCStats->uNumNewNPCs; ++i) 3093 for (uint i = 0; i < pNPCStats->uNumNewNPCs; ++i)
3090 { 3094 {
3091 if (pNPCStats->pNewNPCData[i].uFlags & 0x80) 3095 if (pNPCStats->pNewNPCData[i].uFlags & 0x80)
3092 { 3096 {