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

[Kirben at users.sourceforge.net]

Revision: 31205
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31205&view=rev
Author:   Kirben
Date:     2008-03-20 05:10:30 -0700 (Thu, 20 Mar 2008)

Log Message:
-----------
Add HoF CD demo.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/detection.cpp
    scummvm/trunk/engines/kyra/kyra_v2.cpp
    scummvm/trunk/engines/kyra/resource.cpp
    scummvm/trunk/engines/kyra/sequences_v2.cpp

Modified: scummvm/trunk/engines/kyra/detection.cpp
===================================================================
--- scummvm/trunk/engines/kyra/detection.cpp	2008-03-20 12:07:06 UTC (rev 31204)
+++ scummvm/trunk/engines/kyra/detection.cpp	2008-03-20 12:10:30 UTC (rev 31205)
@@ -50,6 +50,7 @@
 #define KYRA1_DEMO_FLAGS FLAGS(true, false, false, false, Kyra::GI_KYRA1)
 
 #define KYRA2_CD_FLAGS FLAGS(false, false, true, false, Kyra::GI_KYRA2)
+#define KYRA2_CD_DEMO_FLAGS FLAGS(true, false, true, false, Kyra::GI_KYRA2)
 #define KYRA2_DEMO_FLAGS FLAGS(true, false, false, false, Kyra::GI_KYRA2)
 #define KYRA2_TOWNS_FLAGS FLAGS(false, false, false, false, Kyra::GI_KYRA2)
 #define KYRA2_TOWNS_SJIS_FLAGS FLAGS(false, false, false, true, Kyra::GI_KYRA2)
@@ -328,10 +329,22 @@
 		KYRA2_CD_FLAGS
 	},
 
-	{ // Demo
+	{ // Interactive Demo
 		{
 			"kyra2",
 			"Demo",
+			AD_ENTRY1("THANKS.CPS", "b1a78d990b120bb2234b7094f74e30a5"),
+			Common::EN_ANY,
+			Common::kPlatformPC,
+			Common::ADGF_DEMO
+		},
+		KYRA2_CD_DEMO_FLAGS
+	},
+
+	{ // Non-Interactive Demo
+		{
+			"kyra2",
+			"Demo",
 			AD_ENTRY1("GENERAL.PAK", "35825783e5b60755fd520360079f9c15"),
 			Common::EN_ANY,
 			Common::kPlatformPC,

Modified: scummvm/trunk/engines/kyra/kyra_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v2.cpp	2008-03-20 12:07:06 UTC (rev 31204)
+++ scummvm/trunk/engines/kyra/kyra_v2.cpp	2008-03-20 12:10:30 UTC (rev 31205)
@@ -216,7 +216,7 @@
 	}
 
 	// No mouse display in demo
-	if (_flags.isDemo)
+	if (_flags.isDemo && !_flags.isTalkie)
 		return 0;
 
 	tim_setupOpcodes();

Modified: scummvm/trunk/engines/kyra/resource.cpp
===================================================================
--- scummvm/trunk/engines/kyra/resource.cpp	2008-03-20 12:07:06 UTC (rev 31204)
+++ scummvm/trunk/engines/kyra/resource.cpp	2008-03-20 12:10:30 UTC (rev 31205)
@@ -75,7 +75,7 @@
 			loadPakFile("CHAPTER1.VRM");
 	} else if (_vm->game() == GI_KYRA2) {
 		// mouse pointer, fonts, etc. required for initializing
-		if (_vm->gameFlags().isDemo) {
+		if (_vm->gameFlags().isDemo && !_vm->gameFlags().isTalkie) {
 			loadPakFile("GENERAL.PAK");
 		} else {
 			loadPakFile("INTROGEN.PAK");

Modified: scummvm/trunk/engines/kyra/sequences_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sequences_v2.cpp	2008-03-20 12:07:06 UTC (rev 31204)
+++ scummvm/trunk/engines/kyra/sequences_v2.cpp	2008-03-20 12:10:30 UTC (rev 31205)
@@ -2604,7 +2604,7 @@
 	_res->loadFileList(_sequencePakList, _sequencePakListSize);
 
 	int numShp = -1;
-	if (_flags.isDemo) {
+	if (_flags.isDemo && !_flags.isTalkie) {
 		int size;
 		const uint8 *tmp = _staticres->loadRawData(k2SeqplayShapeDefs, size);
 		_demoShapeDefs = new uint8[size];


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