[Scummvm-cvs-logs] scummvm master -> 16bbc07690a48603e080699305d417379bc18cee

DrMcCoy drmccoy at drmccoy.de
Thu Sep 15 17:42:26 CEST 2011


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:
16bbc07690 GOB: Don't explicitly open CD1.ITK for Urban Runner


Commit: 16bbc07690a48603e080699305d417379bc18cee
    https://github.com/scummvm/scummvm/commit/16bbc07690a48603e080699305d417379bc18cee
Author: Sven Hesse (drmccoy at users.sourceforge.net)
Date: 2011-09-15T08:36:55-07:00

Commit Message:
GOB: Don't explicitly open CD1.ITK for Urban Runner

CD1.ITK is the one CD archive file the Urban Runner scripts open
themselves in NO_CD mode. Since the PSP has extremely limited file
handles, having that archive opened twice makes the load code fail
on that device.

Hopefully, the scripts don't decide to close and not reopend CD1.ITK
in places where it's needed. A full playthrough with loading/saving
between screens (especially across CD content borders, and during
death screens) would probably be prudent.

Changed paths:
    engines/gob/init_v6.cpp



diff --git a/engines/gob/init_v6.cpp b/engines/gob/init_v6.cpp
index 9475568..b8b255a 100644
--- a/engines/gob/init_v6.cpp
+++ b/engines/gob/init_v6.cpp
@@ -48,7 +48,6 @@ void Init_v6::initGame() {
 		// (it checks CD1.ITK - CD4.ITK and the first that's found determines
 		// the CD number), while its NO_CD modus wants everything in CD1.ITK.
 		// So we just open the other ITKs, too.
-			_vm->_dataIO->openArchive("CD1.ITK", false);
 			_vm->_dataIO->openArchive("CD2.ITK", false);
 			_vm->_dataIO->openArchive("CD3.ITK", false);
 			_vm->_dataIO->openArchive("CD4.ITK", false);






More information about the Scummvm-git-logs mailing list