From 8997a45773a51583b2e686907cfa60f85b79bfc2 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Sun, 22 Feb 2009 19:45:53 +0000
Subject: SCI: Replaced two uses of sci_fopen by Common::File; moved
 is_print_str() to the only spot it is used

svn-id: r38791
---
 engines/sci/gfx/resource/sci_pal_1.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'engines/sci/gfx/resource/sci_pal_1.cpp')

diff --git a/engines/sci/gfx/resource/sci_pal_1.cpp b/engines/sci/gfx/resource/sci_pal_1.cpp
index 97280cef25..544f6db4f3 100644
--- a/engines/sci/gfx/resource/sci_pal_1.cpp
+++ b/engines/sci/gfx/resource/sci_pal_1.cpp
@@ -25,6 +25,7 @@
 
 /* SCI1 palette resource defrobnicator */
 
+#include "common/file.h"
 #include "sci/include/sci_memory.h"
 #include "sci/gfx/gfx_system.h"
 #include "sci/gfx/gfx_resource.h"
@@ -132,7 +133,7 @@ gfx_pixmap_color_t *gfxr_read_pal1(int id, int *colors_nr, byte *resource, int s
 	return retval;
 }
 
-gfx_pixmap_color_t *gfxr_read_pal1_amiga(int *colors_nr, FILE *f) {
+gfx_pixmap_color_t *gfxr_read_pal1_amiga(int *colors_nr, Common::File &file) {
 	int i;
 	gfx_pixmap_color_t *retval;
 
@@ -141,8 +142,8 @@ gfx_pixmap_color_t *gfxr_read_pal1_amiga(int *colors_nr, FILE *f) {
 	for (i = 0; i < 32; i++) {
 		int b1, b2;
 
-		b1 = fgetc(f);
-		b2 = fgetc(f);
+		b1 = file.readByte();
+		b2 = file.readByte();
 
 		if (b1 == EOF || b2 == EOF) {
 			GFXERROR("Palette file ends prematurely\n");
-- 
cgit v1.2.3