YGGverse/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/YGGverse/xash3d-fwgs.git synced 2025-01-29 16:24:16 +00:00
Code Issues Projects Releases Wiki Activity

console: fix wrong line width on start, remove some hard-coded sizes

Browse Source
This commit is contained in:
mittorn 2019-10-28 12:14:19 +07:00
parent 37cba10c14
commit bb48e5209e
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
engine/client/console.c
View File

@ -1887,8 +1887,8 @@ void Con_DrawInput( int lines )
return; return;
y = lines - ( con.curFont->charHeight * 2 ); y = lines - ( con.curFont->charHeight * 2 );
Con_DrawCharacter( 8, y, ']', g_color_table[7] ); Con_DrawCharacter( con.curFont->charWidths[' '], y, ']', g_color_table[7] );
Field_DrawInputLine( 16, y, &con.input ); Field_DrawInputLine( con.curFont->charWidths[' ']*2, y, &con.input );
} }
/* /*
@ -2086,6 +2086,8 @@ void Con_DrawSolidConsole( int lines )
// draw the background // draw the background
ref.dllFuncs.GL_SetRenderMode( kRenderNormal ); ref.dllFuncs.GL_SetRenderMode( kRenderNormal );
ref.dllFuncs.Color4ub( 255, 255, 255, 255 ); // to prevent grab color from screenfade ref.dllFuncs.Color4ub( 255, 255, 255, 255 ); // to prevent grab color from screenfade
if( refState.width * 3 / 4 < refState.height && lines >= refState.height )
ref.dllFuncs.R_DrawStretchPic( 0, lines - refState.height, refState.width, refState.height - refState.width * 3 / 4, 0, 0, 1, 1, R_GetBuiltinTexture( REF_BLACK_TEXTURE) );
ref.dllFuncs.R_DrawStretchPic( 0, lines - refState.width * 3 / 4, refState.width, refState.width * 3 / 4, 0, 0, 1, 1, con.background ); ref.dllFuncs.R_DrawStretchPic( 0, lines - refState.width * 3 / 4, refState.width, refState.width * 3 / 4, 0, 0, 1, 1, con.background );
if( !con.curFont || !host.allow_console ) if( !con.curFont || !host.allow_console )
@ -2139,7 +2141,7 @@ void Con_DrawSolidConsole( int lines )
y -= Con_DrawConsoleLine( y, x ); y -= Con_DrawConsoleLine( y, x );
// top of console buffer or console window // top of console buffer or console window
if( x == 0 || y < con.curFont->charHeight ) if( x == 0 || y < con.curFont->charHeight )
break; break;
x--; x--;
} }
@ -2363,9 +2365,8 @@ INTERNAL RESOURCE
*/ */
void Con_VidInit( void ) void Con_VidInit( void )
{ {
Con_CheckResize();
Con_LoadConchars(); Con_LoadConchars();
Con_CheckResize();
#if XASH_LOW_MEMORY #if XASH_LOW_MEMORY
con.background = R_GetBuiltinTexture( REF_BLACK_TEXTURE ); con.background = R_GetBuiltinTexture( REF_BLACK_TEXTURE );
#else #else