[Scummvm-cvs-logs] SF.net SVN: scummvm: [22506] scummvm/trunk/engines/scumm/smush
sev at users.sourceforge.net
sev at users.sourceforge.net
Wed May 17 17:22:18 CEST 2006
Revision: 22506
Author: sev
Date: 2006-05-17 17:20:53 -0700 (Wed, 17 May 2006)
ViewCVS: http://svn.sourceforge.net/scummvm/?rev=22506&view=rev
Log Message:
-----------
Give more feedback to users who misused our SAN compression tool and ignored
FLU index for cideos which are used by INSANE.
Modified Paths:
--------------
scummvm/trunk/engines/scumm/smush/chunk.cpp
scummvm/trunk/engines/scumm/smush/chunk.h
Modified: scummvm/trunk/engines/scumm/smush/chunk.cpp
===================================================================
--- scummvm/trunk/engines/scumm/smush/chunk.cpp 2006-05-17 23:52:45 UTC (rev 22505)
+++ scummvm/trunk/engines/scumm/smush/chunk.cpp 2006-05-18 00:20:53 UTC (rev 22506)
@@ -44,7 +44,8 @@
BaseChunk::BaseChunk() :
_type(0),
_size(0),
- _curPos(0) {
+ _curPos(0),
+ _name("") {
}
bool BaseChunk::eof() const {
@@ -81,7 +82,11 @@
_curPos = (uint32)(_size + delta);
break;
}
+
if (_curPos > _size) {
+ if (g_scumm->_insaneRunning) {
+ warning("Looks like you compressed file %s in wrong way. It has FLU index which was not updated", _name.c_str());
+ }
error("invalid seek request : %d > %d (delta == %d)", _curPos, _size, delta);
}
return true;
@@ -109,6 +114,7 @@
_size = _data->readUint32BE();
_offset = _data->pos();
_curPos = 0;
+ _name = name;
}
FileChunk::~FileChunk() {
Modified: scummvm/trunk/engines/scumm/smush/chunk.h
===================================================================
--- scummvm/trunk/engines/scumm/smush/chunk.h 2006-05-17 23:52:45 UTC (rev 22505)
+++ scummvm/trunk/engines/scumm/smush/chunk.h 2006-05-18 00:20:53 UTC (rev 22506)
@@ -57,6 +57,7 @@
Chunk::type _type;
uint32 _size;
uint32 _curPos;
+ Common::String _name;
BaseChunk();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list