[Scummvm-cvs-logs] SF.net SVN: scummvm: [31463] scummvm/trunk

[lordhoto at users.sourceforge.net]

Revision: 31463
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31463&view=rev
Author:   lordhoto
Date:     2008-04-10 08:05:59 -0700 (Thu, 10 Apr 2008)

Log Message:
-----------
- Fixed missing static data for kyra1 demo
- Fixed some warnings in create_kyradat
- Updated kyra.dat for new data for kyra1 demo

Modified Paths:
--------------
    scummvm/trunk/dists/engine-data/kyra.dat
    scummvm/trunk/engines/kyra/sequences_v1.cpp
    scummvm/trunk/tools/create_kyradat/create_kyradat.cpp
    scummvm/trunk/tools/create_kyradat/eng.h
    scummvm/trunk/tools/create_kyradat/misc.h

Modified: scummvm/trunk/dists/engine-data/kyra.dat
===================================================================
(Binary files differ)

Modified: scummvm/trunk/engines/kyra/sequences_v1.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sequences_v1.cpp	2008-04-10 08:27:09 UTC (rev 31462)
+++ scummvm/trunk/engines/kyra/sequences_v1.cpp	2008-04-10 15:05:59 UTC (rev 31463)
@@ -43,7 +43,7 @@
 void KyraEngine_v1::seq_demo() {
 	debugC(9, kDebugLevelMain, "KyraEngine_v1::seq_demo()");
 
-	snd_playTheme(9, 2);
+	snd_playTheme(0, 2);
 
 	_screen->loadBitmap("START.CPS", 7, 7, _screen->_currentPalette);
 	_screen->copyRegion(0, 0, 0, 0, 320, 200, 6, 0);

Modified: scummvm/trunk/tools/create_kyradat/create_kyradat.cpp
===================================================================
--- scummvm/trunk/tools/create_kyradat/create_kyradat.cpp	2008-04-10 08:27:09 UTC (rev 31462)
+++ scummvm/trunk/tools/create_kyradat/create_kyradat.cpp	2008-04-10 15:05:59 UTC (rev 31463)
@@ -852,7 +852,7 @@
 		dst += 2;
 		outsize -= 2;
 		
-		for (int i = 0; i < 20; i ++) {
+		for (int j = 0; j < 20; j++) {
 			WRITE_BE_UINT16(dst, READ_LE_UINT16(src));
 			src += 2;
 			dst += 2;

Modified: scummvm/trunk/tools/create_kyradat/eng.h
===================================================================
--- scummvm/trunk/tools/create_kyradat/eng.h	2008-04-10 08:27:09 UTC (rev 31462)
+++ scummvm/trunk/tools/create_kyradat/eng.h	2008-04-10 15:05:59 UTC (rev 31463)
@@ -184,6 +184,7 @@
 	{ kDemo2Seq, 0x000153E5, 0x00015408 },
 	{ kDemo3Seq, 0x00015408, 0x00015461 },
 	{ kDemo4Seq, 0x00015461, 0x00015481 },
+	{ kAudioTracksIntro, 0x00014E6E, 0x00014E74 },
 	{ -1, 0, 0 }
 };
 

Modified: scummvm/trunk/tools/create_kyradat/misc.h
===================================================================
--- scummvm/trunk/tools/create_kyradat/misc.h	2008-04-10 08:27:09 UTC (rev 31462)
+++ scummvm/trunk/tools/create_kyradat/misc.h	2008-04-10 15:05:59 UTC (rev 31463)
@@ -183,6 +183,7 @@
 	kDemo2Seq,
 	kDemo3Seq,
 	kDemo4Seq,
+	kAudioTracksIntro,
 	-1
 };
 


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