[Scummvm-cvs-logs] SF.net SVN: scummvm:[48470] scummvm/branches/branch-1-1-0/engines/ parallaction/disk_ns.cpp

[Kirben at users.sourceforge.net]

Revision: 48470
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48470&view=rev
Author:   Kirben
Date:     2010-04-02 13:50:12 +0000 (Fri, 02 Apr 2010)

Log Message:
-----------
Backport fix for bug #2969232 - NIPPON: Kos sprite broken (Regression). The current disk archive requires a higher priority, compared to the default disk archives.

Modified Paths:
--------------
    scummvm/branches/branch-1-1-0/engines/parallaction/disk_ns.cpp

Modified: scummvm/branches/branch-1-1-0/engines/parallaction/disk_ns.cpp
===================================================================
--- scummvm/branches/branch-1-1-0/engines/parallaction/disk_ns.cpp	2010-04-02 13:49:59 UTC (rev 48469)
+++ scummvm/branches/branch-1-1-0/engines/parallaction/disk_ns.cpp	2010-04-02 13:50:12 UTC (rev 48470)
@@ -161,7 +161,7 @@
 }
 
 
-#define HIGHEST_PRIORITY			9
+#define HIGHEST_PRIORITY		9
 #define NORMAL_ARCHIVE_PRIORITY		5
 #define LOW_ARCHIVE_PRIORITY		2
 #define LOWEST_ARCHIVE_PRIORITY		1
@@ -209,7 +209,7 @@
 		_sset.remove(_resArchiveName);
 	}
 	_resArchiveName = name;
-	addArchive(name, LOW_ARCHIVE_PRIORITY);
+	addArchive(name, NORMAL_ARCHIVE_PRIORITY);
 
 	return oldName;
 }
@@ -244,7 +244,7 @@
 
 void DosDisk_ns::init() {
 	// setup permament archives
-	addArchive("disk1", NORMAL_ARCHIVE_PRIORITY);
+	addArchive("disk1", LOW_ARCHIVE_PRIORITY);
 }
 
 Common::SeekableReadStream *DosDisk_ns::tryOpenFile(const char* name) {
@@ -713,10 +713,10 @@
 void AmigaDisk_ns::init() {
 	// setup permament archives
 	if (_vm->getFeatures() & GF_DEMO) {
-		addArchive("disk0", NORMAL_ARCHIVE_PRIORITY);
+		addArchive("disk0", LOW_ARCHIVE_PRIORITY);
 	} else {
-		addArchive("disk0", NORMAL_ARCHIVE_PRIORITY);
-		addArchive("disk1", NORMAL_ARCHIVE_PRIORITY);
+		addArchive("disk0", LOW_ARCHIVE_PRIORITY);
+		addArchive("disk1", LOW_ARCHIVE_PRIORITY);
 	}
 }
 


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