Mercurial > mm7

comparison Actor.cpp @ 248:37dcbe8f3cca

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Dialogue stuff
author Nomad
date Mon, 18 Feb 2013 07:11:43 +0200
parents f070b49d40dd
children 0ea5fbd16edb
comparison
equal deleted inserted replaced
247:fb8a876f41e1 248:37dcbe8f3cca
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->uFlags & 0x80) && v5->house >= 0 ) 203 if ( !v5->Hired() && v5->house >= 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;
239 } 239 }
240 if ( (uDialogue_SpeakingActorNPC_ID & 0x80000000u) != 0 ) 240 if ( (uDialogue_SpeakingActorNPC_ID & 0x80000000u) != 0 )
241 v9 = 4; 241 v9 = 4;
242 v11 = GUIWindow::Create(0, 0, 640, 480, (enum WindowType)10, v9, 0); 242 v11 = GUIWindow::Create(0, 0, 640, 480, (enum WindowType)10, v9, 0);
243 pDialogueWindow = v11; 243 pDialogueWindow = v11;
244 if ( v5->uFlags & 0x80 ) 244 if (v5->Hired())
245 { 245 {
246 if ( !v5->bHasUsedTheAbility ) 246 if ( !v5->bHasUsedTheAbility )
247 { 247 {
248 v12 = v5->uProfession; 248 v12 = v5->uProfession;
249 if ( v12 >= 10 ) 249 if ( v12 >= 10 )
269 } 269 }
270 pDialogueWindow->CreateButton(61u, 424u, 0x1Fu, 0x28u, 2, 94, 0x6Eu, 1u, 0x31u, "", 0); 270 pDialogueWindow->CreateButton(61u, 424u, 0x1Fu, 0x28u, 2, 94, 0x6Eu, 1u, 0x31u, "", 0);
271 pDialogueWindow->CreateButton(177u, 424u, 0x1Fu, 0x28u, 2, 94, 0x6Eu, 2u, 0x32u, "", 0); 271 pDialogueWindow->CreateButton(177u, 424u, 0x1Fu, 0x28u, 2, 94, 0x6Eu, 2u, 0x32u, "", 0);
272 pDialogueWindow->CreateButton(292u, 424u, 0x1Fu, 0x28u, 2, 94, 0x6Eu, 3u, 0x33u, "", 0); 272 pDialogueWindow->CreateButton(292u, 424u, 0x1Fu, 0x28u, 2, 94, 0x6Eu, 3u, 0x33u, "", 0);
273 pDialogueWindow->CreateButton(407u, 424u, 0x1Fu, 0x28u, 2, 94, 0x6Eu, 4u, 0x34u, "", 0); 273 pDialogueWindow->CreateButton(407u, 424u, 0x1Fu, 0x28u, 2, 94, 0x6Eu, 4u, 0x34u, "", 0);
274 if ( v17 && uActiveCharacter && !(v5->uFlags & 0x80) ) 274 if (v17 && uActiveCharacter && !v5->Hired())
275 { 275 {
276 if (pParty->uCurrentHour < 5 || pParty->uCurrentHour > 21) 276 if (pParty->uCurrentHour < 5 || pParty->uCurrentHour > 21)
277 pPlayers[uActiveCharacter]->PlaySound(SPEECH_GoodEvening, 0); 277 pPlayers[uActiveCharacter]->PlaySound(SPEECH_GoodEvening, 0);
278 else 278 else
279 pPlayers[uActiveCharacter]->PlaySound(SPEECH_GoodDay, 0); 279 pPlayers[uActiveCharacter]->PlaySound(SPEECH_GoodDay, 0);