[Scummvm-cvs-logs] SF.net SVN: scummvm: [31857] scummvm/trunk/engines/gob/dataio.cpp

[drmccoy at users.sourceforge.net]

Revision: 31857
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31857&view=rev
Author:   drmccoy
Date:     2008-05-03 20:32:23 -0700 (Sat, 03 May 2008)

Log Message:
-----------
Fixed DataStream::seek() (must have been drunk that day ;))

Modified Paths:
--------------
    scummvm/trunk/engines/gob/dataio.cpp

Modified: scummvm/trunk/engines/gob/dataio.cpp
===================================================================
--- scummvm/trunk/engines/gob/dataio.cpp	2008-05-04 02:26:25 UTC (rev 31856)
+++ scummvm/trunk/engines/gob/dataio.cpp	2008-05-04 03:32:23 UTC (rev 31857)
@@ -84,12 +84,10 @@
 void DataStream::seek(int32 offset, int whence) {
 	if (_stream)
 		_stream->seek(offset, whence);
-
-	int32 resPos = _io->seekChunk(_handle, offset, whence);
-	if (resPos != -1)
-		return;
-
-	_io->file_getHandle(_handle)->seek(offset, whence);
+	else if ((_handle < 50) || (_handle >= 128))
+		_io->file_getHandle(_handle)->seek(offset, whence);
+	else
+	_io->seekChunk(_handle, offset, whence);
 }
 
 bool DataStream::eos() const {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.