From 7ae8e44c9556daa07813a3bfd1ace6b0fb0a2aa8 Mon Sep 17 00:00:00 2001 From: Jonathan Gordon Date: Tue, 3 Oct 2006 10:38:27 +0000 Subject: add some consistancy to the path #defines git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11114 a1c6a512-1295-4272-9138-f99709370657 --- apps/plugins/rockpaint.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'apps/plugins/rockpaint.c') diff --git a/apps/plugins/rockpaint.c b/apps/plugins/rockpaint.c index c1b3862ee2..73927ed83d 100644 --- a/apps/plugins/rockpaint.c +++ b/apps/plugins/rockpaint.c @@ -827,7 +827,7 @@ static bool browse_fonts( char *dst, int dst_size ) #define fontname_buf buffer.text.fontname_buf rb->snprintf( old_font, MAX_PATH, - ROCKBOX_DIR FONT_DIR "/%s.fnt", + FONT_DIR "/%s.fnt", rb->global_settings->font_file ); while( 1 ) @@ -850,7 +850,7 @@ static bool browse_fonts( char *dst, int dst_size ) { b_need_redraw = 0; - d = rb->PREFIX(opendir)( ROCKBOX_DIR FONT_DIR "/" ); + d = rb->PREFIX(opendir)( FONT_DIR "/" ); if( !d ) { return false; @@ -880,7 +880,7 @@ static bool browse_fonts( char *dst, int dst_size ) || rb->strcmp( de->d_name + rb->strlen( de->d_name ) - 4, ".fnt" ) ) continue; - rb->snprintf( bbuf, MAX_PATH, ROCKBOX_DIR FONT_DIR "/%s", + rb->snprintf( bbuf, MAX_PATH, FONT_DIR "/%s", de->d_name ); rb->font_load( bbuf ); rb->font_getstringsize( de->d_name, &fw, &fh, FONT_UI ); @@ -915,7 +915,7 @@ static bool browse_fonts( char *dst, int dst_size ) && !rb->strcmp( de->d_name + rb->strlen( de->d_name ) - 4, ".fnt" ) ) { - rb->snprintf( bbuf, MAX_PATH, ROCKBOX_DIR FONT_DIR "/%s", + rb->snprintf( bbuf, MAX_PATH, FONT_DIR "/%s", de->d_name ); rb->font_load( bbuf ); rb->font_getstringsize( de->d_name, NULL, &fh, FONT_UI ); @@ -1463,7 +1463,7 @@ static void draw_text( int x, int y ) { buffer.text.text[0] = '\0'; rb->snprintf( buffer.text.old_font, MAX_PATH, - ROCKBOX_DIR FONT_DIR "/%s.fnt", + FONT_DIR "/%s.fnt", rb->global_settings->font_file ); while( 1 ) { -- cgit v1.2.3