diff options
| -rw-r--r-- | engines/lab/anim.cpp | 2 | ||||
| -rw-r--r-- | engines/lab/music.cpp | 10 | ||||
| -rw-r--r-- | engines/lab/processroom.h | 26 | ||||
| -rw-r--r-- | engines/lab/tilepuzzle.cpp | 4 |
4 files changed, 21 insertions, 21 deletions
diff --git a/engines/lab/anim.cpp b/engines/lab/anim.cpp index b15e71a888..9444a8f9bc 100644 --- a/engines/lab/anim.cpp +++ b/engines/lab/anim.cpp @@ -277,7 +277,7 @@ void Anim::readDiff(Common::File *diffFile, bool playOnce, bool onlyDiffData) { uint32 signature1 = _diffFile->readUint32BE(); uint32 signature2 = _diffFile->readUint32LE(); - if ((signature1 != MKTAG('D', 'I', 'F', 'F')) || (signature2 != 1219009121L)) { + if ((signature1 != MKTAG('D', 'I', 'F', 'F')) || (signature2 != 1219009121)) { _isPlaying = false; return; } 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(); diff --git a/engines/lab/processroom.h b/engines/lab/processroom.h index 9cdada2bfa..3726435390 100644 --- a/engines/lab/processroom.h +++ b/engines/lab/processroom.h @@ -146,21 +146,21 @@ struct InventoryData { // Map Flags // Where the doors are; in a corridor, assumed to be left doors -#define NORTHDOOR 1L -#define EASTDOOR 2L -#define SOUTHDOOR 4L -#define WESTDOOR 8L +#define NORTHDOOR 1 +#define EASTDOOR 2 +#define SOUTHDOOR 4 +#define WESTDOOR 8 // Where the doors are in corridors; M means middle, R means right, B means bottom -#define NORTHMDOOR 16L -#define NORTHRDOOR 32L -#define SOUTHMDOOR 64L -#define SOUTHRDOOR 128L - -#define EASTMDOOR 16L -#define EASTBDOOR 32L -#define WESTMDOOR 64L -#define WESTBDOOR 128L +#define NORTHMDOOR 16 +#define NORTHRDOOR 32 +#define SOUTHMDOOR 64 +#define SOUTHRDOOR 128 + +#define EASTMDOOR 16 +#define EASTBDOOR 32 +#define WESTMDOOR 64 +#define WESTBDOOR 128 // Special Map ID's #define NORMAL 0 diff --git a/engines/lab/tilepuzzle.cpp b/engines/lab/tilepuzzle.cpp index 54507fd85c..4b5fb093b0 100644 --- a/engines/lab/tilepuzzle.cpp +++ b/engines/lab/tilepuzzle.cpp @@ -285,7 +285,7 @@ void TilePuzzle::doTileScroll(uint16 col, uint16 row, uint16 scrolltype) { uint16 x1 = _vm->_utils->vgaScaleX(100) + (col * _vm->_utils->vgaScaleX(30)) + dx; uint16 y1 = _vm->_utils->vgaScaleY(25) + (row * _vm->_utils->vgaScaleY(25)) + dy; - byte *buffer = new byte[_tiles[1]->_width * _tiles[1]->_height * 2L]; + byte *buffer = new byte[_tiles[1]->_width * _tiles[1]->_height * 2]; for (int i = 0; i < last; i++) { _vm->waitTOF(); @@ -313,7 +313,7 @@ void TilePuzzle::changeCombination(uint16 number) { display._width = _vm->_graphics->_screenWidth; display._height = _vm->_graphics->_screenHeight; - byte *buffer = new byte[_tiles[1]->_width * _tiles[1]->_height * 2L]; + byte *buffer = new byte[_tiles[1]->_width * _tiles[1]->_height * 2]; for (uint16 i = 1; i <= (_numberImages[combnum]->_height / 2); i++) { if (_vm->_isHiRes) { |