[Scummvm-cvs-logs] CVS: residual lab.cpp,1.4,1.5 resource.cpp,1.8,1.9

[James Brown]

Update of /cvsroot/scummvm/residual
In directory sc8-pr-cvs1:/tmp/cvs-serv4737

Modified Files:
	lab.cpp resource.cpp 
Log Message:
Readd openNewStream function for gzdopen() via SMUSH


Index: lab.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/lab.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- lab.cpp	12 Dec 2003 08:39:07 -0000	1.4
+++ lab.cpp	13 Dec 2003 11:03:42 -0000	1.5
@@ -90,6 +90,16 @@
   return new Block(data, i->second.len);
 }
 
+std::FILE *Lab::openNewStream(const char *filename) const {
+  file_map_type::const_iterator i = find_filename(filename);
+  if (i == file_map_.end())
+    return NULL;
+
+  std::fseek(f_, i->second.offset, SEEK_SET);
+
+  return f_;
+}
+
 int Lab::fileLength(const char *filename) const {
   file_map_type::const_iterator i = find_filename(filename);
   if (i == file_map_.end())

Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/resource.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- resource.cpp	5 Oct 2003 17:45:46 -0000	1.8
+++ resource.cpp	13 Dec 2003 11:03:42 -0000	1.9
@@ -113,13 +113,14 @@
     return l->getFileBlock(filename);
 }
 
-//std::FILE *ResourceLoader::openNewStream(const char *filename) const {
-//  const Lab *l = findFile(filename);
-//  if (l == NULL)
-//    return NULL;
-//  else
-//    return l->openNewStream(filename);
-//}
+std::FILE *ResourceLoader::openNewStream(const char *filename) const {
+  const Lab *l = findFile(filename);
+
+  if (l == NULL)
+    return NULL;
+  else
+    return l->openNewStream(filename);
+}
 
 int ResourceLoader::fileLength(const char *filename) const {
   const Lab *l = findFile(filename);