From df984b3824c596c7f7e6a12e33bbbe0b2b470586 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Sun, 27 Jun 2004 21:52:25 +0000
Subject: Thanks to File::setDefaultDirectory(), in most cases it is *not*
 necessary to pass getGameDataPath() on to File::open()

svn-id: r14087
---
 scumm/nut_renderer.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'scumm/nut_renderer.cpp')

diff --git a/scumm/nut_renderer.cpp b/scumm/nut_renderer.cpp
index d99d61f1a0..5bf36d1e12 100644
--- a/scumm/nut_renderer.cpp
+++ b/scumm/nut_renderer.cpp
@@ -113,16 +113,16 @@ static int32 codec1(byte *dst, byte *src, int height) {
 	return decoded_length;
 }
 
-bool NutRenderer::loadFont(const char *filename, const char *directory) {
-	debug(8, "NutRenderer::loadFont(\"%s\", \"%s\") called", filename, directory);
+bool NutRenderer::loadFont(const char *filename) {
+	debug(8, "NutRenderer::loadFont(\"%s\") called", filename);
 	if (_loaded) {
 		warning("NutRenderer::loadFont() Font already loaded, ok, loading...");
 	}
 
 	File file;
-	file.open(filename, directory);
+	file.open(filename);
 	if (file.isOpen() == false) {
-		warning("NutRenderer::loadFont() Can't open font file: %s/%s", directory, filename);
+		warning("NutRenderer::loadFont() Can't open font file: %s", filename);
 		return false;
 	}
 
@@ -183,11 +183,11 @@ bool NutRenderer::loadFont(const char *filename, const char *directory) {
 						_chars[l].width--;
 				}
 			} else {
-				warning("NutRenderer::loadFont(%s, %s) there is no FOBJ chunk in FRME chunk %d (offset %x)", filename, directory, l, offset);
+				warning("NutRenderer::loadFont(%s) there is no FOBJ chunk in FRME chunk %d (offset %x)", filename, l, offset);
 				break;
 			}
 		} else {
-			warning("NutRenderer::loadFont(%s, %s) there is no FRME chunk %d (offset %x)", filename, directory, l, offset);
+			warning("NutRenderer::loadFont(%s) there is no FRME chunk %d (offset %x)", filename, l, offset);
 			break;
 		}
 	}
-- 
cgit v1.2.3