Mercurial > mm7

comparison Actor.cpp @ 910:8cd0b155bebe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rings
author Ritor1
date Mon, 22 Apr 2013 17:34:36 +0600
parents b7b67485ec43
children a78f08dbeb88
comparison
equal deleted inserted replaced
909:becbb0b11b7d 910:8cd0b155bebe
228 pTexture_Dialogue_Background = &pIcons_LOD->pTextures[v8]; 228 pTexture_Dialogue_Background = &pIcons_LOD->pTextures[v8];
229 sprintf(pContainer, "npc%03u", v5->uPortraitID); 229 sprintf(pContainer, "npc%03u", v5->uPortraitID);
230 v9 = 0; 230 v9 = 0;
231 pDialogueNPCPortraits[0] = &pIcons_LOD->pTextures[pIcons_LOD->LoadTexture(pContainer, TEXTURE_16BIT_PALETTE)]; 231 pDialogueNPCPortraits[0] = &pIcons_LOD->pTextures[pIcons_LOD->LoadTexture(pContainer, TEXTURE_16BIT_PALETTE)];
232 dword_591084 = areWeLoadingTexture; 232 dword_591084 = areWeLoadingTexture;
233 uTextureID_507B04 = uTextureID_right_panel; 233 uTextureID_right_panel_loop = uTextureID_right_panel;
234 if ( !v5->Hired() && v5->Location2D >= 0 ) 234 if ( !v5->Hired() && v5->Location2D >= 0 )
235 { 235 {
236 if ( (signed int)pParty->GetPartyFame() <= v5->fame 236 if ( (signed int)pParty->GetPartyFame() <= v5->fame
237 || (v10 = v5->uFlags & 0xFFFFFF7F, (v5->uFlags & 0xFFFFFF7F & 0x80000000u) != 0) ) 237 || (v10 = v5->uFlags & 0xFFFFFF7F, (v5->uFlags & 0xFFFFFF7F & 0x80000000u) != 0) )
238 { 238 {