Make the console more like Anox's; introduced con_image and con_size vars to adjust the console.

Author: hogsy

engine/client/cl_scrn.cpp

@@ -156,8 +156,7 @@ void SCR_DrawDebugGraph( void )
 
 	x = scr_vrect.x;
 	y = scr_vrect.y + scr_vrect.height;
-	Draw_Fill( x, y - scr_graphheight->value,
-	           w, scr_graphheight->value, 8 );
+	Draw_Fill( x, y - scr_graphheight->value, w, scr_graphheight->value, chr::ColourF32( 0.0f, 0.0f, 0.0f, 1.0f ) );
 
 	for ( a = 0; a < w; a++ )
 	{
@@ -169,7 +168,7 @@ void SCR_DrawDebugGraph( void )
 		if ( v < 0 )
 			v += scr_graphheight->value * ( 1 + ( int ) ( -v / scr_graphheight->value ) );
 		h = ( int ) v % ( int ) scr_graphheight->value;
-		Draw_Fill( x + w - 1 - a, y - h, 1, h, color );
+		Draw_Fill( x + w - 1 - a, y - h, 1, h, chr::ColourF32( Q_BYTE_TO_FLOAT( color ), 1.0f, 1.0f, 1.0f ) );
 	}
 }
 
@@ -527,20 +526,20 @@ void SCR_DrawConsole( void )
 
 	if ( cls.state == ca_disconnected || cls.state == ca_connecting )
 	{// forced full screen console
-		Con_DrawConsole( 1.0 );
+		Con_DrawConsole();
 		return;
 	}
 
 	if ( cls.state != ca_active || !cl.refresh_prepped )
 	{// connected, but can't render
-		Con_DrawConsole( 0.5 );
-		Draw_Fill( 0, viddef.height / 2, viddef.width, viddef.height / 2, 0 );
+		Con_DrawConsole();
+		Draw_Fill( 0, viddef.height / 2, viddef.width, viddef.height / 2, chr::COLOURF32_BLACK );
 		return;
 	}
 
 	if ( scr_con_current )
 	{
-		Con_DrawConsole( scr_con_current );
+		Con_DrawConsole();
 	}
 	else
 	{
@@ -777,10 +776,11 @@ void SCR_TileClear( void )
 #define STAT_MINUS 10// num frame for '-' stats digit
 static const char *sb_nums[ 2 ][ 11 ] =
         {
-                { "num0", "num1", "num2", "num3", "num4", "num5",
-                  "num6", "num7", "num8", "num9", "white" },
-                { "num0", "num1", "num2", "num3", "num4", "num5",
-                  "num6", "num7", "num8", "num9", "white" } };
+                {"num0", "num1", "num2", "num3", "num4", "num5",
+                 "num6", "num7", "num8", "num9", "white"},
+                {"num0", "num1", "num2", "num3", "num4", "num5",
+                 "num6", "num7", "num8", "num9", "white"}
+};
 
 #define ICON_WIDTH  24
 #define ICON_HEIGHT 24

engine/client/console.cpp

@@ -25,7 +25,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 console_t con;
 
-cvar_t *con_notifytime;
+static cvar_t *con_notifytime;
+static cvar_t *con_image;
+static cvar_t *con_size;
 
 #define MAXCMDLINE 256
 extern char key_lines[ 32 ][ MAXCMDLINE ];
@@ -102,7 +104,7 @@ void Con_ToggleConsole_f( void )
 Con_ToggleChat_f
 ================
 */
-void Con_ToggleChat_f( void )
+static void Con_ToggleChat_f()
 {
 	Key_ClearTyping();
 
@@ -125,7 +127,7 @@ void Con_ToggleChat_f( void )
 Con_Clear_f
 ================
 */
-void Con_Clear_f( void ) { memset( con.text, ' ', CON_TEXTSIZE ); }
+void Con_Clear_f() { memset( con.text, ' ', CON_TEXTSIZE ); }
 
 /*
 ================
@@ -134,7 +136,7 @@ Con_Dump_f
 Save the console contents out to a file
 ================
 */
-void Con_Dump_f( void )
+void Con_Dump_f()
 {
 	int   l, x;
 	char *line;
@@ -194,7 +196,7 @@ void Con_Dump_f( void )
 Con_ClearNotify
 ================
 */
-void Con_ClearNotify( void )
+void Con_ClearNotify()
 {
 	int i;
 
@@ -206,7 +208,7 @@ void Con_ClearNotify( void )
 Con_MessageMode_f
 ================
 */
-void Con_MessageMode_f( void )
+void Con_MessageMode_f()
 {
 	chat_team    = false;
 	cls.key_dest = key_message;
@@ -217,7 +219,7 @@ void Con_MessageMode_f( void )
 Con_MessageMode2_f
 ================
 */
-void Con_MessageMode2_f( void )
+void Con_MessageMode2_f()
 {
 	chat_team    = true;
 	cls.key_dest = key_message;
@@ -230,7 +232,7 @@ Con_CheckResize
 If the line width has changed, reformat the buffer.
 ================
 */
-void Con_CheckResize( void )
+void Con_CheckResize()
 {
 	int  i, j, width, oldwidth, oldtotallines, numlines, numchars;
 	char tbuf[ CON_TEXTSIZE ];
@@ -297,7 +299,9 @@ void Con_Init( void )
 	//
 	// register our commands
 	//
-	con_notifytime = Cvar_Get( "con_notifytime", "3", 0 );
+	con_notifytime = Cvar_Get( "con_notifytime", "3", CVAR_ARCHIVE );
+	con_image      = Cvar_Get( "con_image", "", CVAR_ARCHIVE );
+	con_size       = Cvar_Get( "con_size", "0.8", CVAR_ARCHIVE );
 
 	Cmd_AddCommand( "toggleconsole", Con_ToggleConsole_f );
 	Cmd_AddCommand( "togglechat", Con_ToggleChat_f );
@@ -527,23 +531,30 @@ Con_DrawConsole
 Draws the console with the solid background
 ================
 */
-void Con_DrawConsole( float frac )
+void Con_DrawConsole()
 {
 	int   i, j, x, y, n;
 	int   rows;
 	char *text;
 	int   row;
-	int   lines;
-	char  dlbar[ 1024 ];
 
-	lines = viddef.height * frac;
+	float frac = ( cls.state == ca_disconnected || cls.state == ca_connecting ) ? 1.0f : con_size->value;
+
+	int lines = viddef.height * frac;
 	if ( lines <= 0 ) return;
 
 	if ( lines > viddef.height ) lines = viddef.height;
 
 	// draw the background
-	Draw_StretchPic( 0, -viddef.height + lines, viddef.width, viddef.height,
-	                 "conback" );
+	if ( *con_image->string != '\0' )
+	{
+		Draw_StretchPic( 0, -viddef.height + lines, viddef.width, viddef.height, con_image->string );
+	}
+	else
+	{
+		Draw_Fill( 0, -viddef.height + lines, viddef.width, viddef.height, chr::ColourF32( 0.0f, 0.0f, 0.0f, 0.5f ) );
+	}
+
 	SCR_AddDirtyPoint( 0, 0 );
 	SCR_AddDirtyPoint( viddef.width - 1, lines - 1 );
 
@@ -595,7 +606,8 @@ void Con_DrawConsole( float frac )
 	// figure out width
 	if ( cls.download )
 	{
-		if ( ( text = strrchr( cls.downloadname, '/' ) ) != NULL )
+		char dlbar[ 1024 ];
+		if ( ( text = strrchr( cls.downloadname, '/' ) ) != nullptr )
 			text++;
 		else
 			text = cls.downloadname;

engine/client/console.h

@@ -53,7 +53,7 @@ void Con_DrawCharacter( int cx, int line, int num );
 
 void Con_CheckResize( void );
 void Con_Init( void );
-void Con_DrawConsole( float frac );
+void Con_DrawConsole();
 void Con_Print( char *txt );
 void Con_CenteredPrint( char *text );
 void Con_Clear_f( void );

engine/client/menu.cpp

@@ -1521,7 +1521,7 @@ void M_Menu_Credits_f( void )
 	}
 	else
 	{
-		credits = idcredits;	
+		credits = idcredits;
 	}
 
 	credits_start_time = cls.realtime;
@@ -2271,7 +2271,7 @@ void StartServer_MenuInit( void )
 	/*
 	** maxclients determines the maximum number of players that can join
 	** the game.  If maxclients is only "1" then we should default the menu
-	** option to 8 players, otherwise use whatever its current value is. 
+	** option to 8 players, otherwise use whatever its current value is.
 	** Clamping will be done when the server is actually started.
 	*/
 	s_maxclients_field.generic.type      = MTYPE_FIELD;
@@ -3510,6 +3510,7 @@ M_Draw
 */
 void M_Draw( void )
 {
+#if 0
 	if ( cls.key_dest != key_menu )
 		return;
 
@@ -3532,6 +3533,9 @@ void M_Draw( void )
 		S_StartLocalSound( menu_in_sound );
 		m_entersound = false;
 	}
+#else
+#	pragma message "TODO"
+#endif
 }
 
 

engine/client/qmenu.cpp

@@ -410,6 +410,7 @@ void Menu_Draw( menuframework_s *menu )
 
 void Menu_DrawStatusBar( const char *string )
 {
+#if 0
 	if ( string )
 	{
 		int l = strlen( string );
@@ -424,6 +425,9 @@ void Menu_DrawStatusBar( const char *string )
 	{
 		Draw_Fill( 0, VID_HEIGHT - 8, VID_WIDTH, 8, 0 );
 	}
+#else
+#	pragma message "TODO"
+#endif
 }
 
 void Menu_DrawString( int x, int y, const char *string )
@@ -531,7 +535,7 @@ int Menu_TallySlots( menuframework_s *menu )
 		if ( ( ( menucommon_s * ) menu->items[ i ] )->type == MTYPE_LIST )
 		{
 			int          nitems = 0;
-			const char **n      = ( ( menulist_s      *) menu->items[ i ] )->itemnames;
+			const char **n      = ( ( menulist_s * ) menu->items[ i ] )->itemnames;
 
 			while ( *n )
 				nitems++, n++;
@@ -549,6 +553,7 @@ int Menu_TallySlots( menuframework_s *menu )
 
 void MenuList_Draw( menulist_s *l )
 {
+#if 0
 	const char **n;
 	int          y = 0;
 
@@ -564,6 +569,9 @@ void MenuList_Draw( menulist_s *l )
 		n++;
 		y += 10;
 	}
+#else
+#	pragma message "TODO"
+#endif
 }
 
 void Separator_Draw( menuseparator_s *s )

engine/renderer/ref_gl/gl_draw.cpp

@@ -248,37 +248,36 @@ Draw_Fill
 Fills a box of pixels with a single color
 =============
 */
-void Draw_Fill( int x, int y, int w, int h, int c )
+void Draw_Fill( int x, int y, int w, int h, const chr::ColourF32 &c )
 {
-	union
+	if ( c.a <= 0.0f )
 	{
-		unsigned c{ 0 };
-		byte     v[ 4 ];
-	} color;
+		return;
+	}
 
-	if ( ( unsigned ) c > 255 )
+	if ( c.a != 1.0f )
 	{
-		Com_Error( ERR_FATAL, "Draw_Fill: bad color" );
-		return;
+		glEnable( GL_BLEND );
 	}
 
 	glDisable( GL_TEXTURE_2D );
 
-	color.c = d_8to24table[ c ];
-	glColor3f( color.v[ 0 ] / 255.0,
-	           color.v[ 1 ] / 255.0,
-	           color.v[ 2 ] / 255.0 );
+	glColor4fv( ( float * ) &c );
 
 	glBegin( GL_QUADS );
-
 	glVertex2f( x, y );
 	glVertex2f( x + w, y );
 	glVertex2f( x + w, y + h );
 	glVertex2f( x, y + h );
-
 	glEnd();
-	glColor3f( 1, 1, 1 );
+
+	glColor4f( 1.0f, 1.0f, 1.0f, 1.0f );
 	glEnable( GL_TEXTURE_2D );
+
+	if ( c.a != 1.0f )
+	{
+		glDisable( GL_BLEND );
+	}
 }
 
 //=============================================================================

engine/renderer/ref_gl/gl_local.h

@@ -180,7 +180,7 @@ void Draw_Pic( int x, int y, const char *name );
 void Draw_StretchPic( int x, int y, int w, int h, const char *name );
 void Draw_Char( int x, int y, int c );
 void Draw_TileClear( int x, int y, int w, int h, const char *name );
-void Draw_Fill( int x, int y, int w, int h, int c );
+void Draw_Fill( int x, int y, int w, int h, const chr::ColourF32 &c );
 void Draw_FadeScreen( void );
 void Draw_StretchRaw( int x, int y, int w, int h, int cols, int rows,
                       byte *data );

game/q_shared.h

@@ -149,6 +149,9 @@ namespace chr
 		float r, g, b, a;
 	};
 
+	static constexpr ColourF32 COLOURF32_WHITE = { 1.0f, 1.0f, 1.0f, 1.0f };
+	static constexpr ColourF32 COLOURF32_BLACK = { 0.0f, 0.0f, 0.0f, 1.0f };
+
 	static inline ColourF32 ConvertColourU8ToColourF32( const ColourU8 &src )
 	{
 		return ( ColourF32 ) {