Mercurial > mm7
comparison UI/UIHouses.cpp @ 1662:620b6ba3e6b8
Слияние
author | Ritor1 |
---|---|
date | Wed, 18 Sep 2013 14:20:00 +0600 |
parents | e1d1fe32c194 a7eebb6ee7a2 |
children | 4bbb80c7dba7 |
comparison
equal
deleted
inserted
replaced
1661:e1d1fe32c194 | 1662:620b6ba3e6b8 |
---|---|
3402 { | 3402 { |
3403 if ( pNPC->greet ) | 3403 if ( pNPC->greet ) |
3404 { | 3404 { |
3405 house_window.uFrameWidth = game_viewport_width; | 3405 house_window.uFrameWidth = game_viewport_width; |
3406 house_window.uFrameZ = 452; | 3406 house_window.uFrameZ = 452; |
3407 pInString = pNPCStats->pNPCGreetings[pNPC->greet].pGreeting[((pNPC->uFlags & 3) == 2)]; | 3407 pInString = pNPCStats->pNPCGreetings[pNPC->greet].pGreetings[((pNPC->uFlags & 3) == 2)]; |
3408 //pInString = (char *)*(&pNPCStats->field_17884 + ((pNPC->uFlags & 3) == 2) + 2 * pNPC->greet); | 3408 //pInString = (char *)*(&pNPCStats->field_17884 + ((pNPC->uFlags & 3) == 2) + 2 * pNPC->greet); |
3409 pRenderer->GetLeather(8, 352 - (pFontArrus->CalcTextHeight(pInString, &house_window, 13, 0) + 7), | 3409 pRenderer->GetLeather(8, 352 - (pFontArrus->CalcTextHeight(pInString, &house_window, 13, 0) + 7), |
3410 pIcons_LOD->GetTexture(uTextureID_Leather), pIcons_LOD->GetTexture(uTextureID_Leather)->uTextureHeight | 3410 pIcons_LOD->GetTexture(uTextureID_Leather), pIcons_LOD->GetTexture(uTextureID_Leather)->uTextureHeight |
3411 - (pFontArrus->CalcTextHeight(pInString, &house_window, 13, 0) + 7)); | 3411 - (pFontArrus->CalcTextHeight(pInString, &house_window, 13, 0) + 7)); |
3412 pRenderer->DrawTextureIndexed(8, 347 - (pFontArrus->CalcTextHeight(pInString, &house_window, 13, 0) + 7), pTexture_591428); | 3412 pRenderer->DrawTextureIndexed(8, 347 - (pFontArrus->CalcTextHeight(pInString, &house_window, 13, 0) + 7), pTexture_591428); |