[Scummvm-cvs-logs] SF.net SVN: scummvm:[34736] scummvm/trunk/engines/kyra

[lordhoto at users.sourceforge.net]

Revision: 34736
          http://scummvm.svn.sourceforge.net/scummvm/?rev=34736&view=rev
Author:   lordhoto
Date:     2008-10-03 18:23:57 +0000 (Fri, 03 Oct 2008)

Log Message:
-----------
Cleanup.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/resource.h
    scummvm/trunk/engines/kyra/staticres.cpp

Modified: scummvm/trunk/engines/kyra/resource.h
===================================================================
--- scummvm/trunk/engines/kyra/resource.h	2008-10-03 18:18:42 UTC (rev 34735)
+++ scummvm/trunk/engines/kyra/resource.h	2008-10-03 18:23:57 UTC (rev 34736)
@@ -40,10 +40,6 @@
 #include "kyra/kyra_v1.h"
 #include "kyra/kyra_hof.h"
 
-namespace Common {
-class ArchiveMember;
-} // end of namespace Common
-
 namespace Kyra {
 
 class Resource;

Modified: scummvm/trunk/engines/kyra/staticres.cpp
===================================================================
--- scummvm/trunk/engines/kyra/staticres.cpp	2008-10-03 18:18:42 UTC (rev 34735)
+++ scummvm/trunk/engines/kyra/staticres.cpp	2008-10-03 18:23:57 UTC (rev 34736)
@@ -145,20 +145,22 @@
 	bool foundWorkingKyraDat = false;
 	for (Common::ArchiveMemberList::iterator i = kyraDatFiles.begin(); i != kyraDatFiles.end(); ++i) {
 		Common::SeekableReadStream *file = (*i)->open();
-		if (checkKyraDat(file)) {
-			file->seek(0, SEEK_SET);
-
-			Common::ArchivePtr archive = res->loadArchive(staticDataFilename(), *i);
-			if (archive) {
-				res->_archiveFiles->add(staticDataFilename(), archive, 0);
-				foundWorkingKyraDat = tryKyraDatLoad();
-			}
+		if (!checkKyraDat(file)) {
+			delete file;
+			continue;
 		}
 
-		delete file;
+		delete file; file = 0;
 
-		if (foundWorkingKyraDat)
+		Common::ArchivePtr archive = res->loadArchive(staticDataFilename(), *i);
+		if (!archive)
+			continue;
+	
+		res->_archiveFiles->add(staticDataFilename(), archive, 0);
+		if (tryKyraDatLoad()) {
+			foundWorkingKyraDat = true;
 			break;
+		}
 
 		res->_archiveCache.erase(staticDataFilename());
 		res->_archiveFiles->remove(staticDataFilename());


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