[Scummvm-cvs-logs] CVS: scummvm/scumm/smush chunk.cpp,1.5,1.6 player.cpp,1.11,1.12

Max Horn fingolfin at users.sourceforge.net
Fri Sep 13 11:05:02 CEST 2002


Update of /cvsroot/scummvm/scummvm/scumm/smush
In directory usw-pr-cvs1:/tmp/cvs-serv8388

Modified Files:
	chunk.cpp player.cpp 
Log Message:
some changes to allow me to play The Dig directly from CD (be nice if upper case names are used...)

Index: chunk.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/chunk.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- chunk.cpp	31 Aug 2002 13:29:10 -0000	1.5
+++ chunk.cpp	13 Sep 2002 18:04:17 -0000	1.6
@@ -23,6 +23,7 @@
 #include "chunk.h"
 
 #include "common/engine.h" // for debug, warning, error
+#include "common/file.h"
 
 #include <stdio.h> // for FILE, fopen, fclose, fseek and ftell
 #include <string.h> // for memcpy
@@ -40,7 +41,7 @@
 	FilePtr(const char * fname) : _refcount(1), _curPos(0) {
 		debug(9, "FilePtr created for %s", fname);
 		_filename = strdup(fname);
-		_ifs  = fopen(fname, "rb");
+		_ifs  = fopen_nocase(fname, "rb");
 		if(_ifs == NULL) error("FilePtr unable to read file \"%s\"", fname);
 	}
 	~FilePtr() {

Index: player.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/player.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- player.cpp	31 Aug 2002 13:29:10 -0000	1.11
+++ player.cpp	13 Sep 2002 18:04:17 -0000	1.12
@@ -20,6 +20,7 @@
  */
 
 #include <stdafx.h>
+#include "common/file.h"
 #include "common/util.h"
 #include "common/engine.h" // for debug, warning, error
 
@@ -614,19 +615,18 @@
 	}
 }
 
+#define NEW_FILE	1
 static StringResource * getStrings(const char * file, bool is_encoded) {
 	debug(7, "trying to read text ressources from %s", file);
-	FILE * is;
-	is = fopen(file, "rb");
-	if(is == NULL) return 0;
-	fseek(is, 0, SEEK_END);
-	int32 length = ftell(is);
-	fseek(is, 0, SEEK_SET);
+	File theFile;
+	theFile.open(file);
+	if (!theFile.isOpen())
+		return 0;
+	int32 length = theFile.size();
 	char * filebuffer = new char [length + 1];
 	assert(filebuffer);
-	fread (filebuffer, length, 1, is);
+	theFile.read(filebuffer, length);
 	filebuffer[length] = 0;
-	fclose(is);
 	if(is_encoded) {
 		static const int32 ETRS_HEADER_LENGTH = 16;
 		assert(length > ETRS_HEADER_LENGTH);





More information about the Scummvm-git-logs mailing list