Mercurial > mm7

comparison GUIWindow.cpp @ 827:085eb19b7ffd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mr.Malvik
author Ritor1
date Wed, 27 Mar 2013 01:39:54 +0600
parents b27dd658ea77
children dfd683c4f538
comparison
equal deleted inserted replaced
826:1133e34a7560 827:085eb19b7ffd
1073 if ( in_current_building_type == BildingType_Jail ) 1073 if ( in_current_building_type == BildingType_Jail )
1074 { 1074 {
1075 JailDialog(); 1075 JailDialog();
1076 goto LABEL_58; 1076 goto LABEL_58;
1077 } 1077 }
1078 if ( ptr_F8B1E8 ) 1078 if ( current_npc_text )
1079 { 1079 {
1080 w.uFrameWidth = 458; 1080 w.uFrameWidth = 458;
1081 w.uFrameZ = 457; 1081 w.uFrameZ = 457;
1082 v5 = pFontArrus->CalcTextHeight(ptr_F8B1E8, &w, 13, 0); 1082 v5 = pFontArrus->CalcTextHeight(current_npc_text, &w, 13, 0);
1083 v6 = v5 + 7; 1083 v6 = v5 + 7;
1084 pRenderer->_4A6A68(8, 352 - (v5 + 7), &pIcons_LOD->pTextures[uTextureID_Leather], pIcons_LOD->pTextures[uTextureID_Leather].uTextureHeight - (v5 + 7)); 1084 pRenderer->_4A6A68(8, 352 - (v5 + 7), &pIcons_LOD->pTextures[uTextureID_Leather], pIcons_LOD->pTextures[uTextureID_Leather].uTextureHeight - (v5 + 7));
1085 pRenderer->DrawTextureIndexed(8u, 347 - v6, pTexture_591428); 1085 pRenderer->DrawTextureIndexed(8u, 347 - v6, pTexture_591428);
1086 v7 = FitTextInAWindow(ptr_F8B1E8, pFontArrus, &w, 0xDu, 0); 1086 v7 = FitTextInAWindow(current_npc_text, pFontArrus, &w, 0xDu, 0);
1087 window_SpeakInHouse->DrawText(pFontArrus, 13, 354 - v6, 0, v7, 0, 0, 0); 1087 window_SpeakInHouse->DrawText(pFontArrus, 13, 354 - v6, 0, v7, 0, 0, 0);
1088 } 1088 }
1089 v8 = 0; 1089 v8 = 0;
1090 if ( uNumDialogueNPCPortraits <= 0 ) 1090 if ( uNumDialogueNPCPortraits <= 0 )
1091 goto LABEL_58; 1091 goto LABEL_58;
1795 if ( pWindow->par1C != 1 ) 1795 if ( pWindow->par1C != 1 )
1796 { 1796 {
1797 num_menu_buttons = 0; 1797 num_menu_buttons = 0;
1798 v11 = LOBYTE(pFontArrus->uFontHeight) - 3; 1798 v11 = LOBYTE(pFontArrus->uFontHeight) - 3;
1799 speakingNPC = GetNPCData(sDialogue_SpeakingActorNPC_ID); 1799 speakingNPC = GetNPCData(sDialogue_SpeakingActorNPC_ID);
1800 if ( sub_445C8B(sDialogue_SpeakingActorNPC_ID) == 1 ) 1800 if ( GetGreetType(sDialogue_SpeakingActorNPC_ID) == 1 )//QuestsNPC_greet
1801 { 1801 {
1802 if ( speakingNPC->joins ) 1802 if ( speakingNPC->joins )
1803 { 1803 {
1804 pWindow->CreateButton(480, 130, 140, v11, 1, 0, 0x88u, 0xDu, 0, "", 0); 1804 pWindow->CreateButton(480, 130, 140, v11, 1, 0, 0x88u, 0xDu, 0, "", 0);
1805 num_menu_buttons = 1; 1805 num_menu_buttons = 1;