Change default font color to yellow.

This commit is contained in:
Themaister 2011-10-06 19:10:01 +02:00
parent 7d33cccc8e
commit 81250657f0
3 changed files with 13 additions and 5 deletions

View File

@ -146,7 +146,7 @@ static const unsigned font_size = 48;
static const float message_pos_offset_x = 0.05; static const float message_pos_offset_x = 0.05;
static const float message_pos_offset_y = 0.05; static const float message_pos_offset_y = 0.05;
// Color of the message. // Color of the message.
static const uint32_t message_color = 0xffffff; // RGB hex value. static const uint32_t message_color = 0xffff00; // RGB hex value.
// Render-to-texture before rendering to screen (multi-pass shaders) // Render-to-texture before rendering to screen (multi-pass shaders)
static const bool render_to_texture = false; static const bool render_to_texture = false;

View File

@ -80,9 +80,13 @@ static void sdl_gfx_free(void *data)
static void sdl_init_font(sdl_video_t *vid, const char *font_path, unsigned font_size) static void sdl_init_font(sdl_video_t *vid, const char *font_path, unsigned font_size)
{ {
#ifdef HAVE_FREETYPE #ifdef HAVE_FREETYPE
if (*font_path) const char *path = font_path;
if (!*path)
path = font_renderer_get_default_font();
if (path)
{ {
vid->font = font_renderer_new(font_path, font_size); vid->font = font_renderer_new(path, font_size);
if (vid->font) if (vid->font)
{ {
int r = g_settings.video.msg_color_r * 255; int r = g_settings.video.msg_color_r * 255;

View File

@ -184,9 +184,13 @@ static void set_fullscreen(xv_t *xv)
static void xv_init_font(xv_t *xv, const char *font_path, unsigned font_size) static void xv_init_font(xv_t *xv, const char *font_path, unsigned font_size)
{ {
#ifdef HAVE_FREETYPE #ifdef HAVE_FREETYPE
if (*font_path) const char *path = font_path;
if (!*path)
path = font_renderer_get_default_font();
if (path)
{ {
xv->font = font_renderer_new(font_path, font_size); xv->font = font_renderer_new(path, font_size);
if (xv->font) if (xv->font)
{ {
int r = g_settings.video.msg_color_r * 255; int r = g_settings.video.msg_color_r * 255;