From b918f63f3ee64ff9f5a60afcdb6be14656969e8d Mon Sep 17 00:00:00 2001
From: Vincent Sanders <vince@kyllikki.org>
Date: Tue, 28 May 2013 17:00:55 +0100
Subject: fixup atari option names

---
 atari/plot/font_freetype.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'atari/plot/font_freetype.c')

diff --git a/atari/plot/font_freetype.c b/atari/plot/font_freetype.c
index 8b3980d6d..49e46c857 100755
--- a/atari/plot/font_freetype.c
+++ b/atari/plot/font_freetype.c
@@ -318,7 +318,7 @@ static bool ft_font_init(void)
 	/* Default font, Sans Serif */
 	font_faces[FONT_FACE_SANS_SERIF] = NULL;
 	font_faces[FONT_FACE_SANS_SERIF] = ft_new_face(
-											nsoption_charp(atari_face_sans_serif),
+											nsoption_charp(font_face_sans_serif),
                             				FONT_RESOURCE_PATH "ss.ttf",
                             				FONT_PKG_PATH FONT_FILE_SANS
 										);
@@ -331,55 +331,55 @@ static bool ft_font_init(void)
 
 	/* Sans Serif Bold*/
 	font_faces[FONT_FACE_SANS_SERIF_BOLD] =
-			ft_new_face(nsoption_charp(atari_face_sans_serif_bold),
+			ft_new_face(nsoption_charp(font_face_sans_serif_bold),
                             FONT_RESOURCE_PATH "ssb.ttf",
                             FONT_PKG_PATH FONT_FILE_SANS_BOLD);
 
 	/* Sans Serif Italic */
 	font_faces[FONT_FACE_SANS_SERIF_ITALIC] =
-			ft_new_face(nsoption_charp(atari_face_sans_serif_italic),
+			ft_new_face(nsoption_charp(font_face_sans_serif_italic),
                             FONT_RESOURCE_PATH "ssi.ttf",
                             FONT_PKG_PATH FONT_FILE_SANS_OBLIQUE);
 
 	/* Sans Serif Italic Bold */
 	font_faces[FONT_FACE_SANS_SERIF_ITALIC_BOLD] =
-			ft_new_face(nsoption_charp(atari_face_sans_serif_italic_bold),
+			ft_new_face(nsoption_charp(font_face_sans_serif_italic_bold),
                             FONT_RESOURCE_PATH "ssib.ttf",
                             FONT_PKG_PATH FONT_FILE_SANS_BOLD_OBLIQUE);
 
 	/* Monospaced */
 	font_faces[FONT_FACE_MONOSPACE] =
-			ft_new_face(nsoption_charp(atari_face_monospace),
+			ft_new_face(nsoption_charp(font_face_monospace),
                             FONT_RESOURCE_PATH "mono.ttf",
                             FONT_PKG_PATH FONT_FILE_MONO);
 
 	/* Mospaced Bold */
 	font_faces[FONT_FACE_MONOSPACE_BOLD] =
-			ft_new_face(nsoption_charp(atari_face_monospace_bold),
+			ft_new_face(nsoption_charp(font_face_monospace_bold),
                             FONT_RESOURCE_PATH "monob.ttf",
                             FONT_PKG_PATH FONT_FILE_MONO_BOLD);
 
 	/* Serif */
 	font_faces[FONT_FACE_SERIF] =
-			ft_new_face(nsoption_charp(atari_face_serif),
+			ft_new_face(nsoption_charp(font_face_serif),
                             FONT_RESOURCE_PATH "s.ttf",
                             FONT_PKG_PATH FONT_FILE_SERIF);
 
 	/* Serif Bold */
 	font_faces[FONT_FACE_SERIF_BOLD] =
-			ft_new_face(nsoption_charp(atari_face_serif_bold),
+			ft_new_face(nsoption_charp(font_face_serif_bold),
                             FONT_RESOURCE_PATH "sb.ttf",
                             FONT_PKG_PATH FONT_FILE_SERIF_BOLD);
 
 	/* Cursive */
 	font_faces[FONT_FACE_CURSIVE] =
-			ft_new_face(nsoption_charp(atari_face_cursive),
+			ft_new_face(nsoption_charp(font_face_cursive),
                             FONT_RESOURCE_PATH "cursive.ttf",
                             FONT_PKG_PATH FONT_FILE_OBLIQUE);
 
 	/* Fantasy */
 	font_faces[FONT_FACE_FANTASY] =
-			ft_new_face(nsoption_charp(atari_face_fantasy),
+			ft_new_face(nsoption_charp(font_face_fantasy),
                             FONT_RESOURCE_PATH "fantasy.ttf",
                             FONT_PKG_PATH FONT_FILE_FANTASY);
 
-- 
cgit v1.2.3