[Scummvm-cvs-logs] scummvm master -> dba4084c8abc4f49cce01d08216187f0138a0503

[DrMcCoy]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
dba4084c8a GOB: Calculate _totResStart even if no resources follow


Commit: dba4084c8abc4f49cce01d08216187f0138a0503
    https://github.com/scummvm/scummvm/commit/dba4084c8abc4f49cce01d08216187f0138a0503
Author: Sven Hesse (drmccoy at users.sourceforge.net)
Date: 2014-03-16T16:40:08+01:00

Commit Message:
GOB: Calculate _totResStart even if no resources follow

It's also used as a base offset for TOT strings.
This fixes a crash in the Amiga version of Bargon Attack.

Changed paths:
    engines/gob/resources.cpp



diff --git a/engines/gob/resources.cpp b/engines/gob/resources.cpp
index ac2dead..dbed825 100644
--- a/engines/gob/resources.cpp
+++ b/engines/gob/resources.cpp
@@ -209,6 +209,7 @@ void Resources::unload(bool del) {
 	_totResourceTable = 0;
 	_extResourceTable = 0;
 	_totTextTable = 0;
+	_totResStart = 0;
 	_totData = 0;
 	_totSize = 0;
 	_imData = 0;
@@ -233,6 +234,8 @@ bool Resources::loadTOTResourceTable() {
 	if (!stream)
 		return false;
 
+	_totResStart = totProps.scriptEnd;
+
 	if ((totProps.resourcesOffset == 0xFFFFFFFF) ||
 	    (totProps.resourcesOffset == 0))
 		// No resources here
@@ -271,7 +274,6 @@ bool Resources::loadTOTResourceTable() {
 			item.type = kResourceTOT;
 	}
 
-	_totResStart = totProps.scriptEnd;
 	_totSize = stream->size() - _totResStart;
 
 	if (_totSize <= 0)