Mercurial > mm7

comparison UI/UiGame.cpp @ 1793:4dee76d79c78

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dword_5B65CC to npcIdToDismissAfterDialogue, Party::field_709 to Party::hirelingScrollPosition
author Grumpy7
date Sun, 06 Oct 2013 09:19:12 +0200
parents 24e756a50073
children 9f93b5700e2d 5f9eeb7bf8e6
comparison
equal deleted inserted replaced
1792:3155be890554 1793:4dee76d79c78
185 pTmpBuf[v1++] = i + 2; 185 pTmpBuf[v1++] = i + 2;
186 } 186 }
187 } 187 }
188 } 188 }
189 } 189 }
190 if ( (signed int)((char *)_this + (unsigned __int8)pParty->field_709) < v1 ) 190 if ( (signed int)((char *)_this + pParty->hirelingScrollPosition) < v1 )
191 { 191 {
192 sDialogue_SpeakingActorNPC_ID = -1 - (unsigned __int8)pParty->field_709 - (int)_this; 192 sDialogue_SpeakingActorNPC_ID = -1 - pParty->hirelingScrollPosition - (int)_this;
193 pNPC = GetNewNPCData(sDialogue_SpeakingActorNPC_ID, &a2); 193 pNPC = GetNewNPCData(sDialogue_SpeakingActorNPC_ID, &a2);
194 if ( pNPC ) 194 if ( pNPC )
195 { 195 {
196 if ( a2 == 57 ) 196 if ( a2 == 57 )
197 pText = pNPCTopics[512].pText; // Baby dragon 197 pText = pNPCTopics[512].pText; // Baby dragon
2159 pTmpBuf[v22++] = i + 2; 2159 pTmpBuf[v22++] = i + 2;
2160 } 2160 }
2161 } 2161 }
2162 } 2162 }
2163 2163
2164 for ( int i = (unsigned __int8)pParty->field_709; i < v22 && pNPC_limit_ID < 2; i++ ) 2164 for ( int i = pParty->hirelingScrollPosition; i < v22 && pNPC_limit_ID < 2; i++ )
2165 { 2165 {
2166 if ( (unsigned __int8)pTmpBuf[i] >= 2 ) 2166 if ( (unsigned __int8)pTmpBuf[i] >= 2 )
2167 { 2167 {
2168 sprintf(pContainer, "NPC%03d", pNPCStats->pNPCData[(unsigned __int8)pTmpBuf[i] + 499].uPortraitID); 2168 sprintf(pContainer, "NPC%03d", pNPCStats->pNPCData[(unsigned __int8)pTmpBuf[i] + 499].uPortraitID);
2169 pRenderer->DrawTextureIndexed(pHiredNPCsIconsOffsetsX[pNPC_limit_ID], pHiredNPCsIconsOffsetsY[pNPC_limit_ID], 2169 pRenderer->DrawTextureIndexed(pHiredNPCsIconsOffsetsX[pNPC_limit_ID], pHiredNPCsIconsOffsetsY[pNPC_limit_ID],