diff options
| author | David Corrales | 2007-07-08 16:58:54 +0000 |
|---|---|---|
| committer | David Corrales | 2007-07-08 16:58:54 +0000 |
| commit | 9bfe5d53540af7dc9bf0214202f4e35b272320ea (patch) | |
| tree | 69dcaf6f735e9fd0913a3e2f163852d4b9af87e3 /engines/sky | |
| parent | 256e4d9521b79160d1f9ed670656097a96dc5a34 (diff) | |
| parent | 17da12ca07a1f18f3fe1ef5b0c2c0cd9fd8359b4 (diff) | |
| download | scummvm-rg350-9bfe5d53540af7dc9bf0214202f4e35b272320ea.tar.gz scummvm-rg350-9bfe5d53540af7dc9bf0214202f4e35b272320ea.tar.bz2 scummvm-rg350-9bfe5d53540af7dc9bf0214202f4e35b272320ea.zip | |
Merged the FSNode branch with trunk r27681:27969
svn-id: r27970
Diffstat (limited to 'engines/sky')
| -rw-r--r-- | engines/sky/music/mt32music.cpp | 4 | ||||
| -rw-r--r-- | engines/sky/sound.cpp | 4 | ||||
| -rw-r--r-- | engines/sky/struc.h | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/engines/sky/music/mt32music.cpp b/engines/sky/music/mt32music.cpp index 4f816c6856..2be19a0651 100644 --- a/engines/sky/music/mt32music.cpp +++ b/engines/sky/music/mt32music.cpp @@ -120,7 +120,7 @@ bool MT32Music::processPatchSysEx(uint8 *sysExData) { crc -= sysExBuf[cnt]; sysExBuf[14] = crc & 0x7F; // crc _midiDrv->sysEx(sysExBuf, 15); - g_system->delayMillis(5); + g_system->delayMillis(40); return true; } @@ -170,7 +170,7 @@ void MT32Music::startDriver(void) { sendBuf[len] = crc & 0x7F; len++; _midiDrv->sysEx(sendBuf, len); - g_system->delayMillis (5); + g_system->delayMillis(40); } while (processPatchSysEx(sysExData)) diff --git a/engines/sky/sound.cpp b/engines/sky/sound.cpp index cf769cb3e9..c0dc227718 100644 --- a/engines/sky/sound.cpp +++ b/engines/sky/sound.cpp @@ -46,13 +46,13 @@ struct RoomList { uint8 room; uint8 adlibVolume; uint8 rolandVolume; -}; +} PACKED_STRUCT; struct Sfx { uint8 soundNo; uint8 flags; RoomList roomList[10]; -}; +} PACKED_STRUCT; #include "common/pack-end.h" // END STRUCT PACKING diff --git a/engines/sky/struc.h b/engines/sky/struc.h index 25f0b3d772..cd7155f282 100644 --- a/engines/sky/struc.h +++ b/engines/sky/struc.h @@ -55,7 +55,7 @@ struct dataFileHeader { int16 s_offset_x; int16 s_offset_y; uint16 s_compressed_size; -}; +} PACKED_STRUCT; struct TurnTable { uint16 turnTableUp[5]; @@ -63,7 +63,7 @@ struct TurnTable { uint16 turnTableLeft[5]; uint16 turnTableRight[5]; uint16 turnTableTalk[5]; -}; +} PACKED_STRUCT; struct MegaSet { uint16 gridWidth; // 0 @@ -82,7 +82,7 @@ struct MegaSet { uint16 standRightId; // 11 uint16 standTalkId; // 12 uint16 turnTableId; // 13 -}; +} PACKED_STRUCT; struct Compact { uint16 logic; // 0: Entry in logic table to run (byte as <256entries in logic table @@ -165,7 +165,7 @@ struct Compact { MegaSet megaSet1; // MegaSet megaSet2; // MegaSet megaSet3; // -}; +} PACKED_STRUCT; #include "common/pack-end.h" // END STRUCT PACKING |