ioquake
/
ioq3
mirror of https://github.com/ioquake/ioq3.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(#4922) Use screenYScale, not screenXScale, for scaling Y, by Zack Middleton

This commit is contained in:
Thilo Schulz 2011-03-04 20:32:03 +00:00
parent b764150a97
commit 75cd136c44
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
code/cgame/cg_drawtools.c
View File

@ -604,7 +604,7 @@ static void UI_DrawBannerString2( int x, int y, const char* str, vec4_t color )
trap_R_SetColor( color ); trap_R_SetColor( color );
ax = x * cgs.screenXScale + cgs.screenXBias; ax = x * cgs.screenXScale + cgs.screenXBias;
ay = y * cgs.screenXScale; ay = y * cgs.screenYScale;
s = str; s = str;
while ( *s ) while ( *s )
@ -620,7 +620,7 @@ static void UI_DrawBannerString2( int x, int y, const char* str, vec4_t color )
fwidth = (float)propMapB[ch][2] / 256.0f; fwidth = (float)propMapB[ch][2] / 256.0f;
fheight = (float)PROPB_HEIGHT / 256.0f; fheight = (float)PROPB_HEIGHT / 256.0f;
aw = (float)propMapB[ch][2] * cgs.screenXScale; aw = (float)propMapB[ch][2] * cgs.screenXScale;
ah = (float)PROPB_HEIGHT * cgs.screenXScale; ah = (float)PROPB_HEIGHT * cgs.screenYScale;
trap_R_DrawStretchPic( ax, ay, aw, ah, fcol, frow, fcol+fwidth, frow+fheight, cgs.media.charsetPropB ); trap_R_DrawStretchPic( ax, ay, aw, ah, fcol, frow, fcol+fwidth, frow+fheight, cgs.media.charsetPropB );
ax += (aw + (float)PROPB_GAP_WIDTH * cgs.screenXScale); ax += (aw + (float)PROPB_GAP_WIDTH * cgs.screenXScale);
} }
@ -728,7 +728,7 @@ static void UI_DrawProportionalString2( int x, int y, const char* str, vec4_t co
fwidth = (float)propMap[ch][2] / 256.0f; fwidth = (float)propMap[ch][2] / 256.0f;
fheight = (float)PROP_HEIGHT / 256.0f; fheight = (float)PROP_HEIGHT / 256.0f;
aw = (float)propMap[ch][2] * cgs.screenXScale * sizeScale; aw = (float)propMap[ch][2] * cgs.screenXScale * sizeScale;
ah = (float)PROP_HEIGHT * cgs.screenXScale * sizeScale; ah = (float)PROP_HEIGHT * cgs.screenYScale * sizeScale;
trap_R_DrawStretchPic( ax, ay, aw, ah, fcol, frow, fcol+fwidth, frow+fheight, charset ); trap_R_DrawStretchPic( ax, ay, aw, ah, fcol, frow, fcol+fwidth, frow+fheight, charset );
} else { } else {
aw = 0; aw = 0;