diff options
| author | Strangerke | 2015-12-23 19:47:52 +0100 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2015-12-23 21:43:17 +0100 |
| commit | c9049f232902e7856cb1e27cf6fa333374d46e6f (patch) | |
| tree | 87532d3742125492a71e7938f106a5a845f73341 /engines/lab/music.cpp | |
| parent | 2f1506edecb0f7ad3ab9cf36831ac94f44dda4d7 (diff) | |
| download | scummvm-rg350-c9049f232902e7856cb1e27cf6fa333374d46e6f.tar.gz scummvm-rg350-c9049f232902e7856cb1e27cf6fa333374d46e6f.tar.bz2 scummvm-rg350-c9049f232902e7856cb1e27cf6fa333374d46e6f.zip | |
LAB: Remove left-over long size specifiers
Diffstat (limited to 'engines/lab/music.cpp')
| -rw-r--r-- | engines/lab/music.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/lab/music.cpp b/engines/lab/music.cpp index 4c09d92191..95581aec5c 100644 --- a/engines/lab/music.cpp +++ b/engines/lab/music.cpp @@ -39,8 +39,8 @@ namespace Lab { -#define MUSICBUFSIZE (2 * 65536L) -#define SAMPLESPEED 15000L +#define MUSICBUFSIZE (2 * 65536) +#define SAMPLESPEED 15000 #define CLOWNROOM 123 #define DIMROOM 80 @@ -231,7 +231,7 @@ void Music::changeMusic(const Common::String filename) { if (!_tFile) { _tFile = _file; _oldMusicOn = _musicOn; - _tLeftInFile = _leftInFile + 65536L; + _tLeftInFile = _leftInFile + 65536; if (_tLeftInFile > (uint32)_tFile->size()) _tLeftInFile = _leftInFile; @@ -291,7 +291,7 @@ bool Music::readMusic(const Common::String filename, bool waitTillFinished) { void Music::readSound(bool waitTillFinished, Common::File *file) { uint32 magicBytes = file->readUint32LE(); - if (magicBytes != 1219009121L) { + if (magicBytes != 1219009121) { warning("readSound: Bad signature, skipping"); return; } @@ -321,7 +321,7 @@ void Music::readSound(bool waitTillFinished, Common::File *file) { uint16 sampleRate = file->readUint16LE(); file->skip(2); playSoundEffect(sampleRate, soundSize, file); - } else if (soundTag == 65535L) { + } else if (soundTag == 65535) { if (waitTillFinished) { while (isSoundEffectActive()) { _vm->updateMusicAndEvents(); |