separated slide from scenery loading to take care of filename aliases

svn-id: r25969

4 files changed, 22 insertions, 15 deletions

diff --git a/engines/parallaction/disk.cpp b/engines/parallaction/disk.cpp
index fe51ea125e..8e33816415 100644
--- a/engines/parallaction/disk.cpp
+++ b/engines/parallaction/disk.cpp
@@ -414,4 +414,16 @@ void loadMaskAndPath(const char *name) {
 	return;
 }
 
+void loadSlide(const char *filename) {
+	char path[PATH_LEN];
+	sprintf(path, "%s.slide", filename);
+	loadBackground(path);
+}
+
+void loadScenery(const char *filename) {
+	char path[PATH_LEN];
+	sprintf(path, "%s.dyn", filename);
+	loadBackground(path);
+}
+
 } // namespace Parallaction
diff --git a/engines/parallaction/disk.h b/engines/parallaction/disk.h
index 5e37744e87..27b6012d9f 100644
--- a/engines/parallaction/disk.h
+++ b/engines/parallaction/disk.h
@@ -81,7 +81,8 @@ void loadHead(const char* name, StaticCnv* cnv);
 void loadFont(const char* name, Cnv* cnv);
 void loadStatic(const char* name, StaticCnv* cnv);
 void loadFrames(const char* name, Cnv* cnv);
-void loadBackground(const char *filename);
+void loadSlide(const char *filename);
+void loadScenery(const char *filename);
 void loadMaskAndPath(const char *name);
 
 } // namespace Parallaction
diff --git a/engines/parallaction/location.cpp b/engines/parallaction/location.cpp
index ed5f85f058..84db62aa03 100644
--- a/engines/parallaction/location.cpp
+++ b/engines/parallaction/location.cpp
@@ -278,10 +278,7 @@ void switchBackground(const char* background, const char* mask) {
 		_vm->_graphics->palUnk0(palette);
 	}
 
-	char path[PATH_LEN];
-	sprintf(path, "%s.dyn", background);
-
-	loadBackground(path);
+	loadScenery(background);
 	_vm->_graphics->copyScreen(Graphics::kBitBack, Graphics::kBit2);
 
 	if (scumm_stricmp(background, mask)) {
@@ -365,10 +362,7 @@ void Parallaction::changeLocation(char *location) {
 		*tmp = '\0';
 
 		if (!scumm_strnicmp(tmp+1, "slide", 5)) {
-			char filename[200];
-			sprintf(filename, "%s.slide", _newLocation);
-
-			loadBackground(filename);
+			loadSlide(_newLocation);
 			_vm->_graphics->palUnk0(_palette);
 			_vm->_graphics->copyScreen(Graphics::kBitBack, Graphics::kBitFront);
 
diff --git a/engines/parallaction/menu.cpp b/engines/parallaction/menu.cpp
index a342722743..554917875a 100644
--- a/engines/parallaction/menu.cpp
+++ b/engines/parallaction/menu.cpp
@@ -106,19 +106,19 @@ void Menu::start() {
 
 	_vm->_graphics->setFont("slide");
 
-	loadBackground("intro.slide");
+	loadSlide("intro");
 	_vm->_graphics->palUnk0(_palette);
 	_vm->_graphics->copyScreen(Graphics::kBitBack, Graphics::kBitFront);
 
 	g_system->delayMillis(2000);
 
-	loadBackground("minintro.slide");
+	loadSlide("minintro");
 	_vm->_graphics->palUnk0(_palette);
 	_vm->_graphics->copyScreen(Graphics::kBitBack, Graphics::kBitFront);
 
 	g_system->delayMillis(2000);
 
-	loadBackground("lingua.slide");
+	loadSlide("lingua");
 	_vm->_graphics->palUnk0(_palette);
 	_vm->_graphics->copyScreen(Graphics::kBitBack, Graphics::kBitFront);
 
@@ -146,7 +146,7 @@ void Menu::start() {
 		break;
 	}
 
-	loadBackground("restore.slide");
+	loadSlide("restore");
 	_vm->_graphics->palUnk0(_palette);
 	_vm->_graphics->copyScreen(Graphics::kBitBack, Graphics::kBitFront);
 
@@ -167,7 +167,7 @@ void Menu::newGame() {
 
 	const char **v14 = introMsg3;
 
-	loadBackground("test.dyn");
+	loadScenery("test");
 	_vm->_graphics->palUnk0(_palette);
 	_vm->_graphics->swapBuffers();
 
@@ -317,7 +317,7 @@ void Menu::selectCharacter() {
 	_vm->_graphics->setFont("slide");
 	_vm->_archive.open("disk1");
 
-	loadBackground("password.slide");
+	loadSlide("password");
 	_vm->_graphics->copyScreen(Graphics::kBitBack, Graphics::kBit2);
 	_vm->_graphics->palUnk0(_palette);