ScummVM

Revision: 42463
          http://scummvm.svn.sourceforge.net/scummvm/?rev=42463&view=rev
Author:   drmccoy
Date:     2009-07-13 23:42:37 +0000 (Mon, 13 Jul 2009)

Log Message:
-----------
Allow resource loading from EXT even if the TOT has none again

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

Modified: scummvm/trunk/engines/gob/resources.cpp
===================================================================
--- scummvm/trunk/engines/gob/resources.cpp	2009-07-13 23:36:22 UTC (rev 42462)
+++ scummvm/trunk/engines/gob/resources.cpp	2009-07-13 23:42:37 UTC (rev 42463)
@@ -158,29 +158,29 @@
 
 	_extFile = fileBase + ".ext";
 
-	if (!loadTOTResourceTable()) {
-		unload();
-		return false;
-	}
+	bool hasTOTRes = loadTOTResourceTable();
+	bool hasEXTRes = loadEXTResourceTable();
 
-	if (!loadEXTResourceTable()) {
-		unload();
+	if (!hasTOTRes && !hasEXTRes)
 		return false;
-	}
 
-	if (!loadTOTTextTable(fileBase)) {
-		unload();
-		return false;
-	}
+	if (hasTOTRes) {
+		if (!loadTOTTextTable(fileBase)) {
+			unload();
+			return false;
+		}
 
-	if (!loadIMFile()) {
-		unload();
-		return false;
+		if (!loadIMFile()) {
+			unload();
+			return false;
+		}
 	}
 
-	if (!loadEXFile()) {
-		unload();
-		return false;
+	if (hasEXTRes) {
+		if (!loadEXFile()) {
+			unload();
+			return false;
+		}
 	}
 
 	return true;
@@ -286,7 +286,7 @@
 
 	DataStream *stream = _vm->_dataIO->getDataStream(_extFile.c_str());
 	if (!stream)
-		return true;
+		return false;
 
 	_extResourceTable->itemsCount = stream->readSint16LE();
 	_extResourceTable->unknown    = stream->readByte();


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

Revision: 42551
          http://scummvm.svn.sourceforge.net/scummvm/?rev=42551&view=rev
Author:   drmccoy
Date:     2009-07-17 00:55:42 +0000 (Fri, 17 Jul 2009)

Log Message:
-----------
Added some more debug warnings when resources can't be loaded

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

Modified: scummvm/trunk/engines/gob/resources.cpp
===================================================================
--- scummvm/trunk/engines/gob/resources.cpp	2009-07-17 00:54:50 UTC (rev 42550)
+++ scummvm/trunk/engines/gob/resources.cpp	2009-07-17 00:55:42 UTC (rev 42551)
@@ -588,15 +588,22 @@
 	if (totItem.type == kResourceTOT)
 		data = getTOTData(totItem);
 
-	if (!data)
+	if (!data) {
+		warning("Failed to load TOT resource (%s, %d/%d, %d)",
+				_totFile.c_str(), id, _totResourceTable->itemsCount - 1, totItem.type);
 		return 0;
+	}
 
 	return new Resource(data, totItem.size, false, totItem.width, totItem.height);
 }
 
 Resource *Resources::getEXTResource(uint16 id) const {
-	if (!_extResourceTable || (id > _extResourceTable->itemsCount))
+	if (!_extResourceTable || (id > _extResourceTable->itemsCount)) {
+		warning("Trying to load non-existent EXT resource (%s, %d/%d)",
+				_totFile.c_str(), id,
+				_extResourceTable ? (_extResourceTable->itemsCount - 1) : -1);
 		return 0;
+	}
 
 	EXTResourceItem &extItem = _extResourceTable->items[id];
 
@@ -617,8 +624,11 @@
 	if (extItem.type == kResourceEX)
 		data = getEXData(extItem, size);
 
-	if (!data)
+	if (!data) {
+		warning("Failed to load EXT resource (%s, %d/%d, %d)",
+				_totFile.c_str(), id, _extResourceTable->itemsCount - 1, extItem.type);
 		return 0;
+	}
 
 	if (extItem.packed) {
 		byte *packedData = data;


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

Revision: 47749
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47749&view=rev
Author:   drmccoy
Date:     2010-01-31 13:05:46 +0000 (Sun, 31 Jan 2010)

Log Message:
-----------
Adding some sanity asserts

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

Modified: scummvm/trunk/engines/gob/resources.cpp
===================================================================
--- scummvm/trunk/engines/gob/resources.cpp	2010-01-31 12:54:48 UTC (rev 47748)
+++ scummvm/trunk/engines/gob/resources.cpp	2010-01-31 13:05:46 UTC (rev 47749)
@@ -555,6 +555,8 @@
 	if (id >= _totTextTable->itemsCount)
 		return 0;
 
+	assert(_totTextTable->items);
+
 	TOTTextItem &totItem = _totTextTable->items[id];
 
 	if ((totItem.offset == 0xFFFF) || (totItem.size == 0))
@@ -614,6 +616,8 @@
 		return 0;
 	}
 
+	assert(_totResourceTable->items);
+
 	TOTResourceItem &totItem = _totResourceTable->items[id];
 
 	byte *data = 0;
@@ -639,6 +643,8 @@
 		return 0;
 	}
 
+	assert(_totResourceTable->items);
+
 	EXTResourceItem &extItem = _extResourceTable->items[id];
 
 	uint32 size = extItem.size;


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

Revision: 47750
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47750&view=rev
Author:   drmccoy
Date:     2010-01-31 13:18:32 +0000 (Sun, 31 Jan 2010)

Log Message:
-----------
Properly deleting the TOT resource table again when loading failed

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

Modified: scummvm/trunk/engines/gob/resources.cpp
===================================================================
--- scummvm/trunk/engines/gob/resources.cpp	2010-01-31 13:05:46 UTC (rev 47749)
+++ scummvm/trunk/engines/gob/resources.cpp	2010-01-31 13:18:32 UTC (rev 47750)
@@ -159,6 +159,16 @@
 	bool hasTOTRes = loadTOTResourceTable();
 	bool hasEXTRes = loadEXTResourceTable();
 
+	if (!hasTOTRes) {
+		delete _totResourceTable;
+		_totResourceTable = 0;
+	}
+
+	if (!hasEXTRes) {
+		delete _extResourceTable;
+		_extResourceTable = 0;
+	}
+
 	if (!hasTOTRes && !hasEXTRes)
 		return false;
 
@@ -610,9 +620,10 @@
 }
 
 Resource *Resources::getTOTResource(uint16 id) const {
-	if (id >= _totResourceTable->itemsCount) {
+	if (!_totResourceTable || (id >= _totResourceTable->itemsCount)) {
 		warning("Trying to load non-existent TOT resource (%s, %d/%d)",
-				_totFile.c_str(), id, _totResourceTable->itemsCount - 1);
+				_totFile.c_str(), id,
+				_totResourceTable ? (_totResourceTable->itemsCount - 1) : -1);
 		return 0;
 	}
 
@@ -643,7 +654,7 @@
 		return 0;
 	}
 
-	assert(_totResourceTable->items);
+	assert(_extResourceTable->items);
 
 	EXTResourceItem &extItem = _extResourceTable->items[id];
 


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

Revision: 48054
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48054&view=rev
Author:   strangerke
Date:     2010-02-13 22:17:17 +0000 (Sat, 13 Feb 2010)

Log Message:
-----------
Fix a crash in previous commit

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

Modified: scummvm/trunk/engines/gob/resources.cpp
===================================================================
--- scummvm/trunk/engines/gob/resources.cpp	2010-02-13 21:59:45 UTC (rev 48053)
+++ scummvm/trunk/engines/gob/resources.cpp	2010-02-13 22:17:17 UTC (rev 48054)
@@ -576,7 +576,7 @@
 // HACK: Some Fascination versions (Amiga, Atari and first PC floppies) have a different header, which is a problem here.
 // TODO: Handle that in a proper way
 		if ((_vm->getGameType() == kGameTypeFascination) & (_totTextTable->size < 0))
-			warning("totTextTable with negative size id:%d offset:%d in file %s : (size: %d)", id, totItem.offset, totItem.size, _totFile.c_str(), _totTextTable->size);
+			warning("totTextTable with negative size id:%d offset:%d", id, totItem.offset, totItem.size);
 		else
 			return 0;
 	}


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

Revision: 48055
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48055&view=rev
Author:   strangerke
Date:     2010-02-13 22:26:52 +0000 (Sat, 13 Feb 2010)

Log Message:
-----------
Fascination: REAL fix. Thanks DrMcCoy.

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

Modified: scummvm/trunk/engines/gob/resources.cpp
===================================================================
--- scummvm/trunk/engines/gob/resources.cpp	2010-02-13 22:17:17 UTC (rev 48054)
+++ scummvm/trunk/engines/gob/resources.cpp	2010-02-13 22:26:52 UTC (rev 48055)
@@ -576,7 +576,7 @@
 // HACK: Some Fascination versions (Amiga, Atari and first PC floppies) have a different header, which is a problem here.
 // TODO: Handle that in a proper way
 		if ((_vm->getGameType() == kGameTypeFascination) & (_totTextTable->size < 0))
-			warning("totTextTable with negative size id:%d offset:%d", id, totItem.offset, totItem.size);
+			warning("totTextTable with negative size id:%d offset:%d in file %s : (size: %d)", id, totItem.offset, _totFile.c_str(), _totTextTable->size);
 		else
 			return 0;
 	}


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

Revision: 48067
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48067&view=rev
Author:   strangerke
Date:     2010-02-15 22:17:48 +0000 (Mon, 15 Feb 2010)

Log Message:
-----------
Playtoons - "Fascination" workaround for text is also required for Playtoons.

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

Modified: scummvm/trunk/engines/gob/resources.cpp
===================================================================
--- scummvm/trunk/engines/gob/resources.cpp	2010-02-15 17:10:40 UTC (rev 48066)
+++ scummvm/trunk/engines/gob/resources.cpp	2010-02-15 22:17:48 UTC (rev 48067)
@@ -574,8 +574,9 @@
 		return 0;
 	if ((totItem.offset + totItem.size) > (_totTextTable->size)) {
 // HACK: Some Fascination versions (Amiga, Atari and first PC floppies) have a different header, which is a problem here.
+//       Playtoons also have the same problem (and workaround).
 // TODO: Handle that in a proper way
-		if ((_vm->getGameType() == kGameTypeFascination) & (_totTextTable->size < 0))
+		if (((_vm->getGameType() == kGameTypeFascination) | (_vm->getGameType() == kGameTypePlaytoons)) & (_totTextTable->size < 0))
 			warning("totTextTable with negative size id:%d offset:%d in file %s : (size: %d)", id, totItem.offset, _totFile.c_str(), _totTextTable->size);
 		else
 			return 0;


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

Revision: 48074
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48074&view=rev
Author:   strangerke
Date:     2010-02-16 23:18:32 +0000 (Tue, 16 Feb 2010)

Log Message:
-----------
Fascination - Fix syntax (clone2727)

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

Modified: scummvm/trunk/engines/gob/resources.cpp
===================================================================
--- scummvm/trunk/engines/gob/resources.cpp	2010-02-16 23:15:57 UTC (rev 48073)
+++ scummvm/trunk/engines/gob/resources.cpp	2010-02-16 23:18:32 UTC (rev 48074)
@@ -576,7 +576,7 @@
 // HACK: Some Fascination versions (Amiga, Atari and first PC floppies) have a different header, which is a problem here.
 //       Playtoons also have the same problem (and workaround).
 // TODO: Handle that in a proper way
-		if (((_vm->getGameType() == kGameTypeFascination) | (_vm->getGameType() == kGameTypePlaytoons)) & (_totTextTable->size < 0))
+		if (((_vm->getGameType() == kGameTypeFascination) || (_vm->getGameType() == kGameTypePlaytoons)) && (_totTextTable->size < 0))
 			warning("totTextTable with negative size id:%d offset:%d in file %s : (size: %d)", id, totItem.offset, _totFile.c_str(), _totTextTable->size);
 		else
 			return 0;


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

Revision: 48274
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48274&view=rev
Author:   strangerke
Date:     2010-03-17 20:29:26 +0000 (Wed, 17 Mar 2010)

Log Message:
-----------
Use resSize instead of computing its value again.

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

Modified: scummvm/trunk/engines/gob/resources.cpp
===================================================================
--- scummvm/trunk/engines/gob/resources.cpp	2010-03-16 19:59:12 UTC (rev 48273)
+++ scummvm/trunk/engines/gob/resources.cpp	2010-03-17 20:29:26 UTC (rev 48274)
@@ -246,13 +246,12 @@
 	stream->seek(totProps.resourcesOffset);
 	_totResourceTable->itemsCount = stream->readSint16LE();
 
-	_totResourceTable->dataOffset = totProps.resourcesOffset + kTOTResTableSize +
-	                                _totResourceTable->itemsCount * kTOTResItemSize;
-
-
 	uint32 resSize = _totResourceTable->itemsCount * kTOTResItemSize +
 	                 kTOTResTableSize;
 
+	_totResourceTable->dataOffset = totProps.resourcesOffset + resSize;
+
+
 	// Would the table actually fit into the TOT?
 	if ((totProps.resourcesOffset + resSize) > ((uint32) stream->size()))
 		return false;


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

Revision: 55286
          http://scummvm.svn.sourceforge.net/scummvm/?rev=55286&view=rev
Author:   drmccoy
Date:     2011-01-18 06:30:47 +0000 (Tue, 18 Jan 2011)

Log Message:
-----------
GOB: Fix Urban Runner hotspot texts

Thanks to SylvainTV :)

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

Modified: scummvm/trunk/engines/gob/resources.cpp
===================================================================
--- scummvm/trunk/engines/gob/resources.cpp	2011-01-18 05:09:43 UTC (rev 55285)
+++ scummvm/trunk/engines/gob/resources.cpp	2011-01-18 06:30:47 UTC (rev 55286)
@@ -172,12 +172,12 @@
 	if (!hasTOTRes && !hasEXTRes)
 		return false;
 
+	if (!loadTOTTextTable(_fileBase)) {
+		unload();
+		return false;
+	}
+
 	if (hasTOTRes) {
-		if (!loadTOTTextTable(_fileBase)) {
-			unload();
-			return false;
-		}
-
 		if (!loadIMFile()) {
 			unload();
 			return false;


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