[Scummvm-cvs-logs] CVS: scummvm/scumm charset.cpp,2.92,2.93 nut_renderer.cpp,1.47,1.48 nut_renderer.h,1.18,1.19 resource.cpp,1.223,1.224 resource_v3.cpp,1.26,1.27 script_v6.cpp,1.344,1.345 script_v8.cpp,2.251,2.252 scumm.cpp,1.64,1.65

Max Horn fingolfin at users.sourceforge.net
Sun Jun 27 14:53:02 CEST 2004


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15023

Modified Files:
	charset.cpp nut_renderer.cpp nut_renderer.h resource.cpp 
	resource_v3.cpp script_v6.cpp script_v8.cpp scumm.cpp 
Log Message:
Thanks to File::setDefaultDirectory(), in most cases it is *not* necessary to pass getGameDataPath() on to File::open()

Index: charset.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/charset.cpp,v
retrieving revision 2.92
retrieving revision 2.93
diff -u -d -r2.92 -r2.93
--- charset.cpp	25 Apr 2004 13:34:19 -0000	2.92
+++ charset.cpp	27 Jun 2004 21:52:23 -0000	2.93
@@ -1229,7 +1229,7 @@
 			break;
 		sprintf(fontname, "font%d.nut", i);
 		_fr[i] = new NutRenderer(_vm);
-		if (!(_fr[i]->loadFont(fontname, _vm->getGameDataPath()))) {
+		if (!(_fr[i]->loadFont(fontname))) {
 			delete _fr[i];
 			_fr[i] = NULL;
 		}

Index: nut_renderer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/nut_renderer.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- nut_renderer.cpp	8 Apr 2004 23:38:09 -0000	1.47
+++ nut_renderer.cpp	27 Jun 2004 21:52:23 -0000	1.48
@@ -113,16 +113,16 @@
 	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 @@
 						_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;
 		}
 	}

Index: nut_renderer.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/nut_renderer.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- nut_renderer.h	4 Apr 2004 18:07:26 -0000	1.18
+++ nut_renderer.h	27 Jun 2004 21:52:23 -0000	1.19
@@ -51,7 +51,7 @@
 	virtual ~NutRenderer();
 	int getNbChars() { return _nbChars; }
 
-	bool loadFont(const char *filename, const char *dir);
+	bool loadFont(const char *filename);
 
 	void drawFrame(byte *dst, int c, int x, int y);
 	void drawShadowChar(int c, int x, int y, byte color, bool useMask, bool showShadow);

Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.223
retrieving revision 1.224
diff -u -d -r1.223 -r1.224
--- resource.cpp	26 Jun 2004 12:57:05 -0000	1.223
+++ resource.cpp	27 Jun 2004 21:52:23 -0000	1.224
@@ -845,7 +845,7 @@
 		*(strstr(buffer, " ")) = '\0';
 		
 		debugC(DEBUG_SOUND, "FMUS file %s", buffer);
-		if (dmuFile.open(buffer, getGameDataPath()) == false) {
+		if (dmuFile.open(buffer) == false) {
 			warning("Can't open music file %s*", buffer);
 			res.roomoffs[type][idx] = 0xFFFFFFFF;
 			return 0;

Index: resource_v3.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource_v3.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- resource_v3.cpp	17 Mar 2004 01:50:14 -0000	1.26
+++ resource_v3.cpp	27 Jun 2004 21:52:23 -0000	1.27
@@ -179,7 +179,7 @@
 
 	sprintf(buf, "%02d.LFL", 99 - no);
 	
-	file.open(buf, getGameDataPath());
+	file.open(buf);
 		
 	if (file.isOpen() == false) {
 		error("loadCharset(%d): Missing file charset: %s", no, buf);

Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.344
retrieving revision 1.345
diff -u -d -r1.344 -r1.345
--- script_v6.cpp	27 Jun 2004 21:06:03 -0000	1.344
+++ script_v6.cpp	27 Jun 2004 21:52:23 -0000	1.345
@@ -2510,9 +2510,9 @@
 					// Correct incorrect smush filename in Macintosh FT demo
 					if ((_gameId == GID_FT) && (_features & GF_DEMO) && (_features & GF_MACINTOSH) &&
 					    (strcmp((char *)getStringAddressVar(VAR_VIDEONAME), "jumpgorge.san") == 0))
-						sp->play("jumpgorg.san", getGameDataPath());
+						sp->play("jumpgorg.san");
 					else
-						sp->play((char *)getStringAddressVar(VAR_VIDEONAME), getGameDataPath());
+						sp->play((char *)getStringAddressVar(VAR_VIDEONAME));
 					delete sp;
 				} else if (_gameId == GID_FT) {
 					const int insaneVarNum = ((_features & GF_DEMO) && (_features & GF_PC)) 

Index: script_v8.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v8.cpp,v
retrieving revision 2.251
retrieving revision 2.252
diff -u -d -r2.251 -r2.252
--- script_v8.cpp	25 Jun 2004 22:39:20 -0000	2.251
+++ script_v8.cpp	27 Jun 2004 21:52:23 -0000	2.252
@@ -1244,7 +1244,7 @@
 	debug(4, "o8_startVideo(%s/%s)", getGameDataPath(), (const char*)_scriptPointer);
 
 	SmushPlayer *sp = new SmushPlayer(this, 1000000 / 12);
-	sp->play((const char*)_scriptPointer, getGameDataPath());
+	sp->play((const char*)_scriptPointer);
 	delete sp;
 
 	_scriptPointer += len + 1;

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- scumm.cpp	27 Jun 2004 21:06:03 -0000	1.64
+++ scumm.cpp	27 Jun 2004 21:52:24 -0000	1.65
@@ -791,7 +791,7 @@
 		default:
 			break;
 		}
-		if (fontFile && fp.open(fontFile, getGameDataPath())) {
+		if (fontFile && fp.open(fontFile)) {
 			debug(2, "Loading CJK Font");
 			_CJKMode = true;
 			fp.seek(2, SEEK_CUR);
@@ -822,7 +822,7 @@
 		_2byteWidth = 16;
 		_2byteHeight = 16;
 		//use FM Towns font rom, since game files don't have kanji font resources
-		if (fp.open("fmt_fnt.rom", getGameDataPath()) || fp.open("fmt_fnt.rom", "./")) { 
+		if (fp.open("fmt_fnt.rom")) { 
 			_CJKMode = true;
 			debug(2, "Loading FM Towns Kanji rom");
 			_2byteFontPtr = new byte[((_2byteWidth + 7) / 8) * _2byteHeight * numChar];





More information about the Scummvm-git-logs mailing list