[Scummvm-cvs-logs] SF.net SVN: scummvm: [29023] scummvm/trunk/engines/agi

[mthreepwood at users.sourceforge.net]

Revision: 29023
          http://scummvm.svn.sourceforge.net/scummvm/?rev=29023&view=rev
Author:   mthreepwood
Date:     2007-09-22 10:56:23 -0700 (Sat, 22 Sep 2007)

Log Message:
-----------
allow Winnie Amiga to show the intro

Modified Paths:
--------------
    scummvm/trunk/engines/agi/detection.cpp
    scummvm/trunk/engines/agi/preagi_winnie.cpp

Modified: scummvm/trunk/engines/agi/detection.cpp
===================================================================
--- scummvm/trunk/engines/agi/detection.cpp	2007-09-22 13:27:10 UTC (rev 29022)
+++ scummvm/trunk/engines/agi/detection.cpp	2007-09-22 17:56:23 UTC (rev 29023)
@@ -1651,6 +1651,23 @@
 	},
 
 	{
+		// Winnie the Pooh in the Hundred Acre Wood
+		// preagi game
+		{
+			"winnie",
+			"",
+			AD_ENTRY1("title", "2e7900c1ccaa7671d65405f6d1efed30"),
+			Common::EN_ANY,
+			Common::kPlatformAmiga,
+			Common::ADGF_NO_FLAGS
+		},
+		GID_WINNIE,
+		GType_PreAGI,
+		0,
+		0x0000,
+	},
+
+	{
 		// Xmas Card 1986 (PC) [AGI 2.272]
 		{
 			"xmascard",

Modified: scummvm/trunk/engines/agi/preagi_winnie.cpp
===================================================================
--- scummvm/trunk/engines/agi/preagi_winnie.cpp	2007-09-22 13:27:10 UTC (rev 29022)
+++ scummvm/trunk/engines/agi/preagi_winnie.cpp	2007-09-22 17:56:23 UTC (rev 29023)
@@ -120,12 +120,14 @@
 }
 
 void Winnie::intro() {
-	drawPic(IDS_WTP_FILE_LOGO);
+	drawPic((!_vm->getPlatform() == Common::kPlatformAmiga) ? IDS_WTP_FILE_LOGO : "logo");
 	_vm->printStr(IDS_WTP_INTRO_0);
 	_vm->_gfx->doUpdate();
 	_vm->_system->updateScreen();
 	_vm->_system->delayMillis(0x640);
-	drawPic(IDS_WTP_FILE_TITLE);
+	if (_vm->getPlatform() == Common::kPlatformAmiga)
+		_vm->_gfx->clearScreen(0);
+	drawPic((!_vm->getPlatform() == Common::kPlatformAmiga) ? IDS_WTP_FILE_TITLE : "title");
 	_vm->printStr(IDS_WTP_INTRO_1);
 	_vm->_gfx->doUpdate();
 	_vm->_system->updateScreen();
@@ -969,8 +971,10 @@
 	// construct filename
 	sprintf(szFile, IDS_WTP_PATH, szName);
 	Common::File file;
-	if (!file.open(szName))
+	if (!file.open(szName)) {
+		warning ("Could not open file \'%s\'", szName);
 		return;
+	}
 	uint32 size = file.size();
 	file.read(buffer, size);
 	file.close();
@@ -1104,7 +1108,8 @@
 void Winnie::run() {
 	randomize();
 	intro();
-	gameLoop();
+	if (!_vm->getPlatform() == Common::kPlatformAmiga)
+		gameLoop();
 }
 
 }


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