diff options
| author | Johannes Schickel | 2008-04-10 15:05:59 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2008-04-10 15:05:59 +0000 |
| commit | aac2b7019a1c9680a314e39b88b3b0d4911b7f87 (patch) | |
| tree | a54b25cc73f77fb44b3763ad5808e31c02b7dc6e | |
| parent | 71f6a7e8553f722926ad9277ca870b1f95b482b3 (diff) | |
| download | scummvm-rg350-aac2b7019a1c9680a314e39b88b3b0d4911b7f87.tar.gz scummvm-rg350-aac2b7019a1c9680a314e39b88b3b0d4911b7f87.tar.bz2 scummvm-rg350-aac2b7019a1c9680a314e39b88b3b0d4911b7f87.zip | |
- Fixed missing static data for kyra1 demo
- Fixed some warnings in create_kyradat
- Updated kyra.dat for new data for kyra1 demo
svn-id: r31463
| -rw-r--r-- | dists/engine-data/kyra.dat | bin | 230123 -> 230155 bytes | |||
| -rw-r--r-- | engines/kyra/sequences_v1.cpp | 2 | ||||
| -rw-r--r-- | tools/create_kyradat/create_kyradat.cpp | 2 | ||||
| -rw-r--r-- | tools/create_kyradat/eng.h | 1 | ||||
| -rw-r--r-- | tools/create_kyradat/misc.h | 1 |
5 files changed, 4 insertions, 2 deletions
diff --git a/dists/engine-data/kyra.dat b/dists/engine-data/kyra.dat Binary files differindex 5f47bbf409..0fffe07812 100644 --- a/dists/engine-data/kyra.dat +++ b/dists/engine-data/kyra.dat diff --git a/engines/kyra/sequences_v1.cpp b/engines/kyra/sequences_v1.cpp index 2896994679..65818b87f4 100644 --- a/engines/kyra/sequences_v1.cpp +++ b/engines/kyra/sequences_v1.cpp @@ -43,7 +43,7 @@ namespace Kyra { 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); diff --git a/tools/create_kyradat/create_kyradat.cpp b/tools/create_kyradat/create_kyradat.cpp index ec8238abc7..d57b603e07 100644 --- a/tools/create_kyradat/create_kyradat.cpp +++ b/tools/create_kyradat/create_kyradat.cpp @@ -852,7 +852,7 @@ bool extractHofShapeAnimDataV1(PAKFile &out, const Game *g, const byte *data, co 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; diff --git a/tools/create_kyradat/eng.h b/tools/create_kyradat/eng.h index c2e90ebb07..7ed9e06189 100644 --- a/tools/create_kyradat/eng.h +++ b/tools/create_kyradat/eng.h @@ -184,6 +184,7 @@ const ExtractEntry kyra1EngDemo[] = { { kDemo2Seq, 0x000153E5, 0x00015408 }, { kDemo3Seq, 0x00015408, 0x00015461 }, { kDemo4Seq, 0x00015461, 0x00015481 }, + { kAudioTracksIntro, 0x00014E6E, 0x00014E74 }, { -1, 0, 0 } }; diff --git a/tools/create_kyradat/misc.h b/tools/create_kyradat/misc.h index 72150d94be..a7cce228f8 100644 --- a/tools/create_kyradat/misc.h +++ b/tools/create_kyradat/misc.h @@ -183,6 +183,7 @@ const int kyra1DemoNeed[] = { kDemo2Seq, kDemo3Seq, kDemo4Seq, + kAudioTracksIntro, -1 }; |