[Scummvm-cvs-logs] SF.net SVN: scummvm: [25816] scummvm/trunk/engines/kyra

[kirben at users.sourceforge.net]

Revision: 25816
          http://scummvm.svn.sourceforge.net/scummvm/?rev=25816&view=rev
Author:   kirben
Date:     2007-02-24 01:55:37 -0800 (Sat, 24 Feb 2007)

Log Message:
-----------
Add the Hand of Fate demo.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/kyra2.cpp
    scummvm/trunk/engines/kyra/plugin.cpp

Modified: scummvm/trunk/engines/kyra/kyra2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra2.cpp	2007-02-24 09:17:06 UTC (rev 25815)
+++ scummvm/trunk/engines/kyra/kyra2.cpp	2007-02-24 09:55:37 UTC (rev 25816)
@@ -43,20 +43,28 @@
 int KyraEngine_v2::init() {
 	KyraEngine::init();
 
-	_screen->loadFont(Screen::FID_6_FNT, "6.FNT");
-	_screen->loadFont(Screen::FID_8_FNT, "8FAT.FNT");
+	if (_res->getFileSize("6.FNT")) {
+		_screen->loadFont(Screen::FID_6_FNT, "6.FNT");
+	}
+	if (_res->getFileSize("8FAT.FNT")) {
+		_screen->loadFont(Screen::FID_8_FNT, "8FAT.FNT");
+	}
 	_screen->loadFont(Screen::FID_GOLDFONT_FNT, "GOLDFONT.FNT");
 	_screen->setAnimBlockPtr(3500);
 	_screen->setScreenDim(0);
 	
-	_mouseSHPBuf = _res->fileData("PWGMOUSE.SHP", 0);
-	assert(_mouseSHPBuf);
-
 	assert(_introStringsSize == 21);
 	for (int i = 0; i < 21; i++) {
 		_introStringsDuration[i] = strlen(_introStrings[i]) * 8;
 	}
 	
+	// No mouse display in demo
+	if (_flags.isDemo)
+		return 0;
+
+	_mouseSHPBuf = _res->fileData("PWGMOUSE.SHP", 0);
+	assert(_mouseSHPBuf);
+
 	for (int i = 0; i < 2; i++) {
 		_gameShapes[i] = _screen->getPtrToShape(_mouseSHPBuf, i);
 		assert(_gameShapes[i]);
@@ -67,12 +75,19 @@
 }
 
 int KyraEngine_v2::go() {	
-	// TODO: move this to proper place
-	static const char *soundfileList[] = {
-		"K2INTRO"
-	};
-
-	_sound->setSoundFileList(soundfileList, 1);
+	if (_flags.isDemo) {
+		static const char *soundFileList[] = {
+			"K2_DEMO",
+			"LOLSYSEX"
+		};
+		_sound->setSoundFileList(soundFileList, 2);
+	} else {
+		// TODO: move this to proper place
+		static const char *soundFileList[] = {
+			"K2INTRO"
+		};
+		_sound->setSoundFileList(soundFileList, 1);
+	}
 	_sound->loadSoundFile(0);
 
 	// Temporary measure to work around the fact that there's 

Modified: scummvm/trunk/engines/kyra/plugin.cpp
===================================================================
--- scummvm/trunk/engines/kyra/plugin.cpp	2007-02-24 09:17:06 UTC (rev 25815)
+++ scummvm/trunk/engines/kyra/plugin.cpp	2007-02-24 09:55:37 UTC (rev 25816)
@@ -44,7 +44,8 @@
 #define KYRA1_CD_FLAGS FLAGS(false, true, true, false, Kyra::GI_KYRA1)
 #define KYRA1_DEMO_FLAGS FLAGS(true, false, false, false, Kyra::GI_KYRA1)
 
-#define KYRA2_UNK_FLAGS FLAGS(false, false, false, false, Kyra::GI_KYRA2)
+#define KYRA2_CD_FLAGS FLAGS(false, false, false, false, Kyra::GI_KYRA2)
+#define KYRA2_DEMO_FLAGS FLAGS(true, false, false, false, Kyra::GI_KYRA2)
 
 #define KYRA3_CD_FLAGS FLAGS(false, false, true, false, Kyra::GI_KYRA3)
 
@@ -67,8 +68,10 @@
 
 	{ { "kyra1", "Demo", AD_ENTRY1("DEMO1.WSA", "fb722947d94897512b13b50cc84fd648"), Common::EN_ANY, Common::kPlatformPC, Common::ADGF_DEMO }, KYRA1_DEMO_FLAGS },
 
-	{ { "kyra2", 0, AD_ENTRY1("FATE.PAK", "28cbad1c5bf06b2d3825ae57d760d032"), Common::UNK_LANG, Common::kPlatformPC, Common::ADGF_NO_FLAGS }, KYRA2_UNK_FLAGS }, // check this! (cd version?)
+	{ { "kyra2", 0, AD_ENTRY1("FATE.PAK", "28cbad1c5bf06b2d3825ae57d760d032"), Common::UNK_LANG, Common::kPlatformPC, Common::ADGF_NO_FLAGS }, KYRA2_CD_FLAGS }, // CD version
 
+	{ { "kyra2", "Demo", AD_ENTRY1("GENERAL.PAK", "35825783e5b60755fd520360079f9c15"), Common::UNK_LANG, Common::kPlatformPC, Common::ADGF_DEMO }, KYRA2_DEMO_FLAGS },
+
 	{ { "kyra3", 0, AD_ENTRY1("ONETIME.PAK", "3833ff312757b8e6147f464cca0a6587"), Common::EN_ANY, Common::kPlatformPC, Common::ADGF_NO_FLAGS }, KYRA3_CD_FLAGS },
 	{ { "kyra3", 0, AD_ENTRY1("ONETIME.PAK", "3833ff312757b8e6147f464cca0a6587"), Common::DE_DEU, Common::kPlatformPC, Common::ADGF_NO_FLAGS }, KYRA3_CD_FLAGS },
 	{ { "kyra3", 0, AD_ENTRY1("ONETIME.PAK", "3833ff312757b8e6147f464cca0a6587"), Common::FR_FRA, Common::kPlatformPC, Common::ADGF_NO_FLAGS }, KYRA3_CD_FLAGS },


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