Mercurial > mm7

comparison UI/UIHouses.cpp @ 1496:ab6bf38b2940

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
UIGame.cpp cleaning(continue)
author Ritor1
date Sun, 01 Sep 2013 17:10:29 +0600
parents 7ef4b64f6329
children f47eab1a70d8
comparison
equal deleted inserted replaced
1488:f62e6d06acac 1496:ab6bf38b2940
2508 pOutString = pFontCreate; 2508 pOutString = pFontCreate;
2509 v9 = pFontCreate->CalcTextHeight(current_npc_text, &w, 13, 0) + 7; 2509 v9 = pFontCreate->CalcTextHeight(current_npc_text, &w, 13, 0) + 7;
2510 } 2510 }
2511 2511
2512 auto pTex = pIcons_LOD->GetTexture(uTextureID_Leather); 2512 auto pTex = pIcons_LOD->GetTexture(uTextureID_Leather);
2513 pRenderer->_4A6A68(8u, 352 - v9, pTex, pTex->uTextureHeight - v9); 2513 pRenderer->GetLeather(8, 352 - v9, pTex, pTex->uTextureHeight - v9);
2514 pRenderer->DrawTextureIndexed(8u, 347 - v9, pTexture_591428); 2514 pRenderer->DrawTextureIndexed(8, 347 - v9, pTexture_591428);
2515 v10 = FitTextInAWindow(current_npc_text, pOutString, &w, 0xDu, 0); 2515 v10 = FitTextInAWindow(current_npc_text, pOutString, &w, 13, 0);
2516 a1.DrawText(pOutString, 13, 354 - v9, 0, v10, 0, 0, 0); 2516 a1.DrawText(pOutString, 13, 354 - v9, 0, v10, 0, 0, 0);
2517 break; 2517 break;
2518 } 2518 }
2519 case HOUSE_DIALOGUE_TOWNHALL_100: 2519 case HOUSE_DIALOGUE_TOWNHALL_100:
2520 { 2520 {
2930 { 2930 {
2931 pOutString = pFontCreate; 2931 pOutString = pFontCreate;
2932 pTextHeight = pFontCreate->CalcTextHeight(pTmpBuf.data(), &dialog_window, 12, 0) + 7; 2932 pTextHeight = pFontCreate->CalcTextHeight(pTmpBuf.data(), &dialog_window, 12, 0) + 7;
2933 } 2933 }
2934 auto pTex = pIcons_LOD->GetTexture(uTextureID_Leather); 2934 auto pTex = pIcons_LOD->GetTexture(uTextureID_Leather);
2935 pRenderer->_4A6A68(8, 352 - pTextHeight, pTex, pTex->uTextureHeight - pTextHeight); 2935 pRenderer->GetLeather(8, 352 - pTextHeight, pTex, pTex->uTextureHeight - pTextHeight);
2936 pRenderer->DrawTextureIndexed(8, 347 - pTextHeight, pTexture_591428); 2936 pRenderer->DrawTextureIndexed(8, 347 - pTextHeight, pTexture_591428);
2937 v63 = FitTextInAWindow(pTmpBuf.data(), pOutString, &dialog_window, 0xCu, 0); 2937 v63 = FitTextInAWindow(pTmpBuf.data(), pOutString, &dialog_window, 0xCu, 0);
2938 window_SpeakInHouse->DrawText(pOutString, 12, 354 - pTextHeight, 0, v63, 0, 0, 0); 2938 window_SpeakInHouse->DrawText(pOutString, 12, 354 - pTextHeight, 0, v63, 0, 0, 0);
2939 break; 2939 break;
2940 } 2940 }
2944 dialog_window.uFrameWidth = game_viewport_width; 2944 dialog_window.uFrameWidth = game_viewport_width;
2945 dialog_window.uFrameZ = 452; 2945 dialog_window.uFrameZ = 452;
2946 v61 = pFontArrus->CalcTextHeight(pTmpBuf.data(), &dialog_window, 12, 0); 2946 v61 = pFontArrus->CalcTextHeight(pTmpBuf.data(), &dialog_window, 12, 0);
2947 pTextHeight = v61 + 7; 2947 pTextHeight = v61 + 7;
2948 auto pTex = pIcons_LOD->GetTexture(uTextureID_Leather); 2948 auto pTex = pIcons_LOD->GetTexture(uTextureID_Leather);
2949 pRenderer->_4A6A68(8, 352 - (v61 + 7), pTex, pTex->uTextureHeight - (v61 + 7)); 2949 pRenderer->GetLeather(8, 352 - (v61 + 7), pTex, pTex->uTextureHeight - (v61 + 7));
2950 pRenderer->DrawTextureIndexed(8, 347 - pTextHeight, pTexture_591428); 2950 pRenderer->DrawTextureIndexed(8, 347 - pTextHeight, pTexture_591428);
2951 v63 = FitTextInAWindow(pTmpBuf.data(), pFontArrus, &dialog_window, 0xCu, 0); 2951 v63 = FitTextInAWindow(pTmpBuf.data(), pFontArrus, &dialog_window, 0xCu, 0);
2952 window_SpeakInHouse->DrawText(pFontArrus, 12, 354 - pTextHeight, 0, v63, 0, 0, 0); 2952 window_SpeakInHouse->DrawText(pFontArrus, 12, 354 - pTextHeight, 0, v63, 0, 0, 0);
2953 break; 2953 break;
2954 } 2954 }
4222 a1.uFrameWidth = game_viewport_width; 4222 a1.uFrameWidth = game_viewport_width;
4223 a1.uFrameZ = 452; 4223 a1.uFrameZ = 452;
4224 pInString = (char *)*(&pNPCStats->field_17884 + ((v10 & 3) == 2) + 2 * v9); 4224 pInString = (char *)*(&pNPCStats->field_17884 + ((v10 & 3) == 2) + 2 * v9);
4225 v11 = pFontArrus->CalcTextHeight(pInString, &a1, 13, 0); 4225 v11 = pFontArrus->CalcTextHeight(pInString, &a1, 13, 0);
4226 v12 = v11 + 7; 4226 v12 = v11 + 7;
4227 pRenderer->_4A6A68(8, 352 - (v11 + 7), 4227 pRenderer->GetLeather(8, 352 - (v11 + 7),
4228 pIcons_LOD->GetTexture(uTextureID_Leather), 4228 pIcons_LOD->GetTexture(uTextureID_Leather),
4229 pIcons_LOD->GetTexture(uTextureID_Leather)->uTextureHeight - (v11 + 7)); 4229 pIcons_LOD->GetTexture(uTextureID_Leather)->uTextureHeight - (v11 + 7));
4230 pRenderer->DrawTextureIndexed(8u, 347 - v12, pTexture_591428); 4230 pRenderer->DrawTextureIndexed(8u, 347 - v12, pTexture_591428);
4231 v13 = FitTextInAWindow(pInString, pFontArrus, &a1, 0xDu, 0); 4231 v13 = FitTextInAWindow(pInString, pFontArrus, &a1, 0xDu, 0);
4232 pDialogueWindow->DrawText(pFontArrus, 13, 354 - v12, 0, v13, 0, 0, 0); 4232 pDialogueWindow->DrawText(pFontArrus, 13, 354 - v12, 0, v13, 0, 0, 0);
4425 if ( 352 - v48 < 8 ) 4425 if ( 352 - v48 < 8 )
4426 { 4426 {
4427 v47 = pFontCreate; 4427 v47 = pFontCreate;
4428 v48 = pFontCreate->CalcTextHeight(current_npc_text, &w, 13, 0) + 7; 4428 v48 = pFontCreate->CalcTextHeight(current_npc_text, &w, 13, 0) + 7;
4429 } 4429 }
4430 pRenderer->_4A6A68(8, 352 - v48, 4430 pRenderer->GetLeather(8, 352 - v48, pIcons_LOD->GetTexture(uTextureID_Leather), pIcons_LOD->GetTexture(uTextureID_Leather)->uTextureHeight - v48);
4431 pIcons_LOD->GetTexture(uTextureID_Leather),
4432 pIcons_LOD->GetTexture(uTextureID_Leather)->uTextureHeight - v48);
4433 pRenderer->DrawTextureIndexed(8u, 347 - v48, pTexture_591428); 4431 pRenderer->DrawTextureIndexed(8u, 347 - v48, pTexture_591428);
4434 v49 = FitTextInAWindow(current_npc_text, v47, &w, 0xDu, 0); 4432 v49 = FitTextInAWindow(current_npc_text, v47, &w, 13, 0);
4435 a1.DrawText(v47, 13, 354 - v48, 0, v49, 0, 0, 0); 4433 a1.DrawText(v47, 13, 354 - v48, 0, v49, 0, 0, 0);
4436 } 4434 }
4437 } 4435 }
4438 4436
4439 //----- (004B4F4F) -------------------------------------------------------- 4437 //----- (004B4F4F) --------------------------------------------------------