diff options
| author | Max Horn | 2010-01-16 21:34:36 +0000 |
|---|---|---|
| committer | Max Horn | 2010-01-16 21:34:36 +0000 |
| commit | b8f2a3a34271b73ab2cb84ea25e5fbf80e076658 (patch) | |
| tree | e743e5d5427547bee4cba1107d61e4999dd32832 /engines | |
| parent | 570911b83ede482386a7c0212b982ce8a06c86bd (diff) | |
| download | scummvm-rg350-b8f2a3a34271b73ab2cb84ea25e5fbf80e076658.tar.gz scummvm-rg350-b8f2a3a34271b73ab2cb84ea25e5fbf80e076658.tar.bz2 scummvm-rg350-b8f2a3a34271b73ab2cb84ea25e5fbf80e076658.zip | |
cleanup
svn-id: r47333
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/groovie/music.cpp | 2 | ||||
| -rw-r--r-- | engines/m4/mads_anim.cpp | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/engines/groovie/music.cpp b/engines/groovie/music.cpp index d05a4c1b65..a5dd5d809a 100644 --- a/engines/groovie/music.cpp +++ b/engines/groovie/music.cpp @@ -405,7 +405,7 @@ MusicPlayerXMI::MusicPlayerXMI(GroovieEngine *vm, const Common::String >lName) loadTimbres(gtlName + ".ad"); // Setup the percussion channel - for (unsigned int i = 0; i < _timbres.size(); i++) { + for (uint i = 0; i < _timbres.size(); i++) { if (_timbres[i].bank == 0x7F) setTimbreAD(9, _timbres[i]); } diff --git a/engines/m4/mads_anim.cpp b/engines/m4/mads_anim.cpp index 7a8d55c545..ffa3b4bc9c 100644 --- a/engines/m4/mads_anim.cpp +++ b/engines/m4/mads_anim.cpp @@ -573,8 +573,7 @@ void AnimviewView::readNextCommand() { assert(_vm->_resourceManager->resourceExists(aaFile.filenames[seriesCtr].c_str())); // Start sound - if (aaFile.flags & AA_HAS_SOUND) - { + if (aaFile.flags & AA_HAS_SOUND) { char buffer[100]; strcpy(buffer, aaFile.soundName.c_str()); buffer[0] = 'A'; // A for AdLib resource @@ -720,7 +719,7 @@ AAFile::AAFile(const char *resourceName, M4Engine* vm): MadsPack(resourceName, v Common::MemoryReadStream stream2(*getItemStream(2)); Common::MemoryReadStream stream(*getItemStream(0)); -printf("ss %d %d %d\n", stream.size(), stream1.size(), stream2.size()); + seriesCount = stream.readUint16LE(); frameCount = stream.readUint16LE(); frameEntryCount = stream.readUint16LE(); |