Mercurial > mm7

comparison mm7_3.cpp @ 949:c0d0656aa662

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Awards
author Nomad
date Wed, 01 May 2013 20:04:24 +0200
parents 5a2dbb00c399
children 9a5db2cf999a
comparison
equal deleted inserted replaced
948:5a2dbb00c399 949:c0d0656aa662
12579 pNPC = GetNPCData(sDialogue_SpeakingActorNPC_ID); 12579 pNPC = GetNPCData(sDialogue_SpeakingActorNPC_ID);
12580 pGreetType = GetGreetType(sDialogue_SpeakingActorNPC_ID); 12580 pGreetType = GetGreetType(sDialogue_SpeakingActorNPC_ID);
12581 v51.uFrameWidth -= 10; 12581 v51.uFrameWidth -= 10;
12582 v51.uFrameZ -= 10; 12582 v51.uFrameZ -= 10;
12583 //v54 = v1; 12583 //v54 = v1;
12584 GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0xFFu, 0xFFu); 12584 TargetColor(0xFFu, 0xFFu, 0xFFu);
12585 GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xE1u, 0xCDu, 0x23u); 12585 TargetColor(0xE1u, 0xCDu, 0x23u);
12586 v2 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0x15u, 0x99u, 0xE9u); 12586 v2 = TargetColor(0x15u, 0x99u, 0xE9u);
12587 pRenderer->DrawTextureIndexed(477, 0, pTexture_Dialogue_Background); 12587 pRenderer->DrawTextureIndexed(477, 0, pTexture_Dialogue_Background);
12588 pRenderer->DrawTextureTransparent(468, 0, (Texture *)(uTextureID_right_panel_loop != -1 ? &pIcons_LOD->pTextures[uTextureID_right_panel_loop] : 0)); 12588 pRenderer->DrawTextureTransparent(468, 0, (Texture *)(uTextureID_right_panel_loop != -1 ? &pIcons_LOD->pTextures[uTextureID_right_panel_loop] : 0));
12589 pRenderer->DrawTextureIndexed(pNPCPortraits_x[0][0] - 4, pNPCPortraits_y[0][0] - 4, (Texture *)(uTextureID_50795C != -1 ? &pIcons_LOD->pTextures[uTextureID_50795C] : 0)); 12589 pRenderer->DrawTextureIndexed(pNPCPortraits_x[0][0] - 4, pNPCPortraits_y[0][0] - 4, (Texture *)(uTextureID_50795C != -1 ? &pIcons_LOD->pTextures[uTextureID_50795C] : 0));
12590 pRenderer->DrawTextureIndexed(pNPCPortraits_x[0][0], pNPCPortraits_y[0][0], pDialogueNPCPortraits[0]); 12590 pRenderer->DrawTextureIndexed(pNPCPortraits_x[0][0], pNPCPortraits_y[0][0], pDialogueNPCPortraits[0]);
12591 12591
12817 } 12817 }
12818 } 12818 }
12819 12819
12820 12820
12821 v32 = 0; 12821 v32 = 0;
12822 //pInString = (char *)GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0xFFu, 0xFFu); 12822 //pInString = (char *)TargetColor(0xFFu, 0xFFu, 0xFFu);
12823 v33 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xE1u, 0xCDu, 0x23u); 12823 v33 = TargetColor(0xE1u, 0xCDu, 0x23u);
12824 v34 = pDialogueWindow; 12824 v34 = pDialogueWindow;
12825 //v54 = v33; 12825 //v54 = v33;
12826 v35 = pDialogueWindow->pStartingPosActiveItem; 12826 v35 = pDialogueWindow->pStartingPosActiveItem;
12827 for ( i = v35 + pDialogueWindow->pNumPresenceButton; v35 < i; i = pDialogueWindow->pNumPresenceButton + pDialogueWindow->pStartingPosActiveItem ) 12827 for ( i = v35 + pDialogueWindow->pNumPresenceButton; v35 < i; i = pDialogueWindow->pNumPresenceButton + pDialogueWindow->pStartingPosActiveItem )
12828 { 12828 {
12862 v43->uHeight = v44; 12862 v43->uHeight = v44;
12863 v42 = v45 + v44 - 1; 12863 v42 = v45 + v44 - 1;
12864 v43->uW = v42; 12864 v43->uW = v42;
12865 v47 = v33; 12865 v47 = v33;
12866 if ( (unsigned __int16 *)pDialogueWindow->pCurrentPosActiveItem != v46 ) 12866 if ( (unsigned __int16 *)pDialogueWindow->pCurrentPosActiveItem != v46 )
12867 v47 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0xFFu, 0xFFu); 12867 v47 = TargetColor(0xFFu, 0xFFu, 0xFFu);
12868 v52.DrawTitleText(pFontArrus, 0, v45, v47, Str, 3u); 12868 v52.DrawTitleText(pFontArrus, 0, v45, v47, Str, 3u);
12869 v34 = pDialogueWindow; 12869 v34 = pDialogueWindow;
12870 ++v55; 12870 ++v55;
12871 ++v41; 12871 ++v41;
12872 } 12872 }