Mercurial > mm7

comparison Actor.cpp @ 291:0ea5fbd16edb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
NPC mostly done
author Gloval
date Tue, 19 Feb 2013 00:34:15 +0400
parents 37dcbe8f3cca
children 3dcc9d945eeb
comparison
equal deleted inserted replaced
290:4776715a964b 291:0ea5fbd16edb
198 sprintf(pContainer, "npc%03u", v5->uPortraitID); 198 sprintf(pContainer, "npc%03u", v5->uPortraitID);
199 v9 = 0; 199 v9 = 0;
200 pDialogueNPCPortraits[0] = &pIcons_LOD->pTextures[pIcons_LOD->LoadTexture(pContainer, TEXTURE_16BIT_PALETTE)]; 200 pDialogueNPCPortraits[0] = &pIcons_LOD->pTextures[pIcons_LOD->LoadTexture(pContainer, TEXTURE_16BIT_PALETTE)];
201 dword_591084 = areWeLoadingTexture; 201 dword_591084 = areWeLoadingTexture;
202 uTextureID_507B04 = uTextureID_right_panel; 202 uTextureID_507B04 = uTextureID_right_panel;
203 if ( !v5->Hired() && v5->house >= 0 ) 203 if ( !v5->Hired() && v5->Location2D >= 0 )
204 { 204 {
205 if ( (signed int)pParty->GetPartyFame() <= v5->fame 205 if ( (signed int)pParty->GetPartyFame() <= v5->fame
206 || (v10 = v5->uFlags & 0xFFFFFF7F, (v5->uFlags & 0xFFFFFF7F & 0x80000000u) != 0) ) 206 || (v10 = v5->uFlags & 0xFFFFFF7F, (v5->uFlags & 0xFFFFFF7F & 0x80000000u) != 0) )
207 { 207 {
208 v9 = 1; 208 v9 = 1;