[Scummvm-cvs-logs] SF.net SVN: scummvm: [30714] scummvm/trunk/engines/parallaction

peres001 at users.sourceforge.net peres001 at users.sourceforge.net
Thu Jan 31 11:38:15 CET 2008


Revision: 30714
          http://scummvm.svn.sourceforge.net/scummvm/?rev=30714&view=rev
Author:   peres001
Date:     2008-01-31 02:38:15 -0800 (Thu, 31 Jan 2008)

Log Message:
-----------
Slightly simplified Archive selection when loading resources.

Modified Paths:
--------------
    scummvm/trunk/engines/parallaction/disk_ns.cpp
    scummvm/trunk/engines/parallaction/gui_ns.cpp
    scummvm/trunk/engines/parallaction/parallaction_ns.cpp

Modified: scummvm/trunk/engines/parallaction/disk_ns.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/disk_ns.cpp	2008-01-31 04:45:32 UTC (rev 30713)
+++ scummvm/trunk/engines/parallaction/disk_ns.cpp	2008-01-31 10:38:15 UTC (rev 30714)
@@ -1252,18 +1252,7 @@
 
 void AmigaDisk_ns::loadSlide(BackgroundInfo& info, const char *name) {
 	debugC(1, kDebugDisk, "AmigaDisk_ns::loadSlide '%s'", name);
-
-	char path[PATH_LEN];
-	sprintf(path, "slides/%s", name);
-	Common::SeekableReadStream *s = openArchivedFile(path, false);
-
-	if (s)
-		loadBackground(info, path);
-	else
-		loadBackground(info, name);
-
-	delete s;
-
+	loadBackground(info, name);
 	return;
 }
 

Modified: scummvm/trunk/engines/parallaction/gui_ns.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/gui_ns.cpp	2008-01-31 04:45:32 UTC (rev 30713)
+++ scummvm/trunk/engines/parallaction/gui_ns.cpp	2008-01-31 10:38:15 UTC (rev 30714)
@@ -123,7 +123,7 @@
 
 void Parallaction_ns::guiStart() {
 
-	_disk->selectArchive((getFeatures() & GF_LANG_MULT) ? "disk1" : "disk0");
+	_disk->selectArchive((getFeatures() & GF_DEMO) ? "disk0" : "disk1");
 
 	guiSplash();
 
@@ -386,7 +386,7 @@
 	setArrowCursor();
 	_soundMan->stopMusic();
 
-	_disk->selectArchive((getFeatures() & GF_LANG_MULT) ? "disk1" : "disk0");
+	_disk->selectArchive((getFeatures() & GF_DEMO) ? "disk0" : "disk1");
 
 	showSlide("password");
 

Modified: scummvm/trunk/engines/parallaction/parallaction_ns.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction_ns.cpp	2008-01-31 04:45:32 UTC (rev 30713)
+++ scummvm/trunk/engines/parallaction/parallaction_ns.cpp	2008-01-31 10:38:15 UTC (rev 30714)
@@ -366,8 +366,6 @@
 	if (!_char.dummy()) {
 		if (getPlatform() == Common::kPlatformAmiga) {
 			_disk->selectArchive("disk0");
-		} else {
-			_disk->selectArchive("disk1");
 		}
 
 		_char._head = _disk->loadHead(_char.getBaseName());


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