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

[peres001 at users.sourceforge.net]

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

Log Message:
-----------
no more overloading for loadBackground

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

Modified: scummvm/trunk/engines/parallaction/disk.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/disk.cpp	2007-03-04 11:10:55 UTC (rev 25970)
+++ scummvm/trunk/engines/parallaction/disk.cpp	2007-03-04 12:55:25 UTC (rev 25971)
@@ -420,22 +420,16 @@
 	loadBackground(path);
 }
 
-void loadScenery(const char *filename) {
+void loadScenery(const char *name, const char *mask) {
 	char path[PATH_LEN];
-	sprintf(path, "%s.dyn", filename);
+	sprintf(path, "%s.dyn", name);
 	loadBackground(path);
-}
 
-void loadBackground(const char* background, const char* mask) {
-
-	loadScenery(background);
-
-	if (scumm_stricmp(background, mask)) {
+	if (mask != NULL) {
 		// 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:10:55 UTC (rev 25970)
+++ scummvm/trunk/engines/parallaction/disk.h	2007-03-04 12:55:25 UTC (rev 25971)
@@ -82,8 +82,7 @@
 void loadStatic(const char* name, StaticCnv* cnv);
 void loadFrames(const char* name, Cnv* cnv);
 void loadSlide(const char *filename);
-void loadScenery(const char *filename);
-void loadBackground(const char* background, const char* mask);
+void loadScenery(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:10:55 UTC (rev 25970)
+++ scummvm/trunk/engines/parallaction/location.cpp	2007-03-04 12:55:25 UTC (rev 25971)
@@ -65,8 +65,7 @@
 			if (mask) {
 				mask[0] = '\0';
 				mask++;
-			} else
-				mask = _tokens[1];
+			}
 
             // WORKAROUND: the original code erroneously incremented
             // _currentLocationIndex, thus producing inconsistent
@@ -278,7 +277,7 @@
 		_vm->_graphics->palUnk0(palette);
 	}
 
-	loadBackground(background, mask);
+	loadScenery(background, mask);
 
 	return;
 }

Modified: scummvm/trunk/engines/parallaction/menu.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/menu.cpp	2007-03-04 11:10:55 UTC (rev 25970)
+++ scummvm/trunk/engines/parallaction/menu.cpp	2007-03-04 12:55:25 UTC (rev 25971)
@@ -167,7 +167,7 @@
 
 	const char **v14 = introMsg3;
 
-	loadScenery("test");
+	loadScenery("test", NULL);
 	_vm->_graphics->palUnk0(_palette);
 	_vm->_graphics->swapBuffers();
 


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