Mercurial > mm7

comparison mm7_4.cpp @ 973:ec7568e13b24

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Minor code cleaning.
author Nomad
date Wed, 08 May 2013 21:37:12 +0200
parents c8a0f6d89c70
children 9334a8c59c8d
comparison
equal deleted inserted replaced
972:c8a0f6d89c70 973:ec7568e13b24
7349 a1.uFrameWidth = game_viewport_width; 7349 a1.uFrameWidth = game_viewport_width;
7350 a1.uFrameZ = 452; 7350 a1.uFrameZ = 452;
7351 pInString = (char *)*(&pNPCStats->field_17884 + ((v10 & 3) == 2) + 2 * v9); 7351 pInString = (char *)*(&pNPCStats->field_17884 + ((v10 & 3) == 2) + 2 * v9);
7352 v11 = pFontArrus->CalcTextHeight(pInString, &a1, 13, 0); 7352 v11 = pFontArrus->CalcTextHeight(pInString, &a1, 13, 0);
7353 v12 = v11 + 7; 7353 v12 = v11 + 7;
7354 pRenderer->_4A6A68( 7354 pRenderer->_4A6A68(8, 352 - (v11 + 7),
7355 8u, 7355 pIcons_LOD->GetTexture(uTextureID_Leather),
7356 352 - (v11 + 7), 7356 pIcons_LOD->GetTexture(uTextureID_Leather)->uTextureHeight - (v11 + 7));
7357 (Texture *)(uTextureID_Leather != -1 ? &pIcons_LOD->pTextures[uTextureID_Leather] : 0),
7358 (uTextureID_Leather != -1 ? pIcons_LOD->pTextures[uTextureID_Leather].uTextureHeight : 26) - (v11 + 7));
7359 pRenderer->DrawTextureIndexed(8u, 347 - v12, pTexture_591428); 7357 pRenderer->DrawTextureIndexed(8u, 347 - v12, pTexture_591428);
7360 v13 = FitTextInAWindow(pInString, pFontArrus, &a1, 0xDu, 0); 7358 v13 = FitTextInAWindow(pInString, pFontArrus, &a1, 0xDu, 0);
7361 pDialogueWindow->DrawText(pFontArrus, 13, 354 - v12, 0, v13, 0, 0, 0); 7359 pDialogueWindow->DrawText(pFontArrus, 13, 354 - v12, 0, v13, 0, 0, 0);
7362 } 7360 }
7363 } 7361 }
7554 if ( 352 - v48 < 8 ) 7552 if ( 352 - v48 < 8 )
7555 { 7553 {
7556 v47 = pFontCreate; 7554 v47 = pFontCreate;
7557 v48 = pFontCreate->CalcTextHeight(current_npc_text, &w, 13, 0) + 7; 7555 v48 = pFontCreate->CalcTextHeight(current_npc_text, &w, 13, 0) + 7;
7558 } 7556 }
7559 pRenderer->_4A6A68( 7557 pRenderer->_4A6A68(8, 352 - v48,
7560 8u, 7558 pIcons_LOD->GetTexture(uTextureID_Leather),
7561 352 - v48, 7559 pIcons_LOD->GetTexture(uTextureID_Leather)->uTextureHeight - v48);
7562 (Texture *)(uTextureID_Leather != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_Leather] : 0),
7563 (uTextureID_Leather != -1 ? pIcons_LOD->pTextures[uTextureID_Leather].uTextureHeight : 26) - v48);
7564 pRenderer->DrawTextureIndexed(8u, 347 - v48, pTexture_591428); 7560 pRenderer->DrawTextureIndexed(8u, 347 - v48, pTexture_591428);
7565 v49 = FitTextInAWindow(current_npc_text, v47, &w, 0xDu, 0); 7561 v49 = FitTextInAWindow(current_npc_text, v47, &w, 0xDu, 0);
7566 a1.DrawText(v47, 13, 354 - v48, 0, v49, 0, 0, 0); 7562 a1.DrawText(v47, 13, 354 - v48, 0, v49, 0, 0, 0);
7567 } 7563 }
7568 } 7564 }