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

[peres001 at users.sourceforge.net]

Revision: 26312
          http://scummvm.svn.sourceforge.net/scummvm/?rev=26312&view=rev
Author:   peres001
Date:     2007-03-27 15:03:00 -0700 (Tue, 27 Mar 2007)

Log Message:
-----------
engine can now handle amiga and dos splash screens

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

Modified: scummvm/trunk/engines/parallaction/menu.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/menu.cpp	2007-03-27 22:02:07 UTC (rev 26311)
+++ scummvm/trunk/engines/parallaction/menu.cpp	2007-03-27 22:03:00 UTC (rev 26312)
@@ -100,9 +100,9 @@
 
 void Menu::start() {
 
-	_vm->_disk->selectArchive("disk1");
+	_vm->_disk->selectArchive((_vm->getPlatform() == Common::kPlatformPC) ? "disk1" : "disk0");
+
 	_vm->_gfx->_proportionalFont = false;
-
 	_vm->_gfx->setFont("slide");
 
 	_vm->_disk->loadSlide("intro");
@@ -117,26 +117,23 @@
 
 	g_system->delayMillis(2000);
 
-	_vm->_disk->loadSlide("lingua");
-	_vm->_gfx->palUnk0(_vm->_gfx->_palette);
-	_vm->_gfx->copyScreen(Gfx::kBitBack, Gfx::kBitFront);
+	if (_vm->getPlatform() == Common::kPlatformPC) {
 
-	_vm->_gfx->displayString(60, 30, "SELECT LANGUAGE");
+		_vm->_disk->loadSlide("lingua");
+		_vm->_gfx->palUnk0(_vm->_gfx->_palette);
+		_vm->_gfx->copyScreen(Gfx::kBitBack, Gfx::kBitFront);
 
-	_vm->_gfx->copyScreen(Gfx::kBitFront, Gfx::kBitBack);
-	_vm->_gfx->copyScreen(Gfx::kBitBack, Gfx::kBit2);
-	_language = chooseLanguage();
+		_vm->_gfx->displayString(60, 30, "SELECT LANGUAGE");
 
-	_vm->_disk->setLanguage(_language);
+		_vm->_gfx->copyScreen(Gfx::kBitFront, Gfx::kBitBack);
+		_vm->_gfx->copyScreen(Gfx::kBitBack, Gfx::kBit2);
+		_language = chooseLanguage();
 
-	_vm->_disk->loadSlide("restore");
-	_vm->_gfx->palUnk0(_vm->_gfx->_palette);
-	_vm->_gfx->copyScreen(Gfx::kBitBack, Gfx::kBitFront);
+		_vm->_disk->setLanguage(_language);
 
-	_vm->_gfx->copyScreen(Gfx::kBitBack, Gfx::kBit2);
-
-	if (selectGame() == 0) {
-		newGame();
+		if (selectGame() == 0) {
+			newGame();
+		}
 	}
 
 	return;
@@ -218,6 +215,14 @@
 uint16 Menu::selectGame() {
 //	  printf("selectGame()\n");
 
+
+	_vm->_disk->loadSlide("restore");
+	_vm->_gfx->palUnk0(_vm->_gfx->_palette);
+	_vm->_gfx->copyScreen(Gfx::kBitBack, Gfx::kBitFront);
+
+	_vm->_gfx->copyScreen(Gfx::kBitBack, Gfx::kBit2);
+
+
 	uint16 _si = 0;
 	uint16 _di = 3;
 
@@ -286,7 +291,8 @@
 	_vm->_gfx->_proportionalFont = false;
 	_vm->_gfx->setFont("slide");
 
-	_vm->_disk->selectArchive("disk1");
+	_vm->_disk->selectArchive((_vm->getPlatform() == Common::kPlatformPC) ? "disk1" : "disk0");
+
 	_vm->_disk->loadSlide("password");	// loads background into kBitBack buffer
 
 	_vm->_gfx->copyScreen(Gfx::kBitBack, Gfx::kBitFront);	//

Modified: scummvm/trunk/engines/parallaction/parallaction.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction.cpp	2007-03-27 22:02:07 UTC (rev 26311)
+++ scummvm/trunk/engines/parallaction/parallaction.cpp	2007-03-27 22:03:00 UTC (rev 26312)
@@ -792,12 +792,13 @@
 		// character for sanity before memory is freed
 		freeCharacter();
 
-		_disk->selectArchive("disk1");
+		_disk->selectArchive((_vm->getPlatform() == Common::kPlatformPC) ? "disk1" : "disk0");
 
 		char path[PATH_LEN];
 		strcpy(path, v32);
 		_vm->_char._normalFrames = _disk->loadFrames(path);
 
+
 		if (!IS_DUMMY_CHARACTER(name)) {
 			_vm->_char._head = _disk->loadHead(path);
 			_vm->_char._talk = _disk->loadTalk(path);


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