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

[peres001 at users.sourceforge.net]

Revision: 25970
          http://scummvm.svn.sourceforge.net/scummvm/?rev=25970&view=rev
Author:   peres001
Date:     2007-03-04 03:10:55 -0800 (Sun, 04 Mar 2007)

Log Message:
-----------
hid mask and path loading details from the engine, so it is now independent from background management

Modified Paths:
--------------
    scummvm/trunk/engines/parallaction/disk.cpp
    scummvm/trunk/engines/parallaction/disk.h
    scummvm/trunk/engines/parallaction/location.cpp

Modified: scummvm/trunk/engines/parallaction/disk.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/disk.cpp	2007-03-04 11:03:27 UTC (rev 25969)
+++ scummvm/trunk/engines/parallaction/disk.cpp	2007-03-04 11:10:55 UTC (rev 25970)
@@ -426,4 +426,16 @@
 	loadBackground(path);
 }
 
+void loadBackground(const char* background, const char* mask) {
+
+	loadScenery(background);
+
+	if (scumm_stricmp(background, mask)) {
+		// load external masks and paths only for certain locations
+		loadMaskAndPath(mask);
+	}
+
+}
+
+
 } // namespace Parallaction

Modified: scummvm/trunk/engines/parallaction/disk.h
===================================================================
--- scummvm/trunk/engines/parallaction/disk.h	2007-03-04 11:03:27 UTC (rev 25969)
+++ scummvm/trunk/engines/parallaction/disk.h	2007-03-04 11:10:55 UTC (rev 25970)
@@ -83,7 +83,7 @@
 void loadFrames(const char* name, Cnv* cnv);
 void loadSlide(const char *filename);
 void loadScenery(const char *filename);
-void loadMaskAndPath(const char *name);
+void loadBackground(const char* background, const char* mask);
 
 } // namespace Parallaction
 

Modified: scummvm/trunk/engines/parallaction/location.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/location.cpp	2007-03-04 11:03:27 UTC (rev 25969)
+++ scummvm/trunk/engines/parallaction/location.cpp	2007-03-04 11:10:55 UTC (rev 25970)
@@ -278,14 +278,8 @@
 		_vm->_graphics->palUnk0(palette);
 	}
 
-	loadScenery(background);
-	_vm->_graphics->copyScreen(Graphics::kBitBack, Graphics::kBit2);
+	loadBackground(background, mask);
 
-	if (scumm_stricmp(background, mask)) {
-		// load external masks and paths only for certain locations
-		loadMaskAndPath(mask);
-	}
-
 	return;
 }
 


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