diff options
author | Strangerke | 2014-12-12 22:33:46 +0100 |
---|---|---|
committer | Paul Gilbert | 2014-12-12 23:08:18 -0500 |
commit | 712a18d0500dd51dc113ebaf5ac420ceaa8e456c (patch) | |
tree | 5de6753bead6d065763c4f2a0bbc8f13d7755cf8 | |
parent | b1f63a9985055a7a71ebfdfb14bfe1d59502ad16 (diff) | |
download | scummvm-rg350-712a18d0500dd51dc113ebaf5ac420ceaa8e456c.tar.gz scummvm-rg350-712a18d0500dd51dc113ebaf5ac420ceaa8e456c.tar.bz2 scummvm-rg350-712a18d0500dd51dc113ebaf5ac420ceaa8e456c.zip |
ACCESS: Fix compilation errors reported by Criezy
-rw-r--r-- | engines/access/access.cpp | 2 | ||||
-rw-r--r-- | engines/access/amazon/amazon_scripts.cpp | 4 | ||||
-rw-r--r-- | engines/access/sound.cpp | 2 | ||||
-rw-r--r-- | engines/access/sound.h | 3 |
4 files changed, 5 insertions, 6 deletions
diff --git a/engines/access/access.cpp b/engines/access/access.cpp index 97b08d73c4..d0bd3e6eed 100644 --- a/engines/access/access.cpp +++ b/engines/access/access.cpp @@ -150,7 +150,7 @@ void AccessEngine::initialize() { _player = Player::init(this); _screen = new Screen(this); _sound = new SoundManager(this, _mixer); - _midi = new MusicManager(this, _mixer); + _midi = new MusicManager(this); _video = new VideoPlayer(this); _buffer1.create(g_system->getWidth() + TILE_WIDTH, g_system->getHeight()); diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp index 52c142a415..ce9a3d5c5c 100644 --- a/engines/access/amazon/amazon_scripts.cpp +++ b/engines/access/amazon/amazon_scripts.cpp @@ -481,8 +481,8 @@ void AmazonScripts::cmdChapter() { } void AmazonScripts::cmdSetHelp() { - int arrayId = (_data->readUint16LE() && 0xFF) - 1; - int helpId = _data->readUint16LE() && 0xFF; + int arrayId = (_data->readUint16LE() & 0xFF) - 1; + int helpId = _data->readUint16LE() & 0xFF; byte *help = _game->_helpTbl[arrayId]; help[helpId] = 1; diff --git a/engines/access/sound.cpp b/engines/access/sound.cpp index 4e701618d9..e151458f21 100644 --- a/engines/access/sound.cpp +++ b/engines/access/sound.cpp @@ -162,7 +162,7 @@ void SoundManager::freeSounds() { /******************************************************************************************/ -MusicManager::MusicManager(AccessEngine *vm, Audio::Mixer *mixer) : _vm(vm), _mixer(mixer) { +MusicManager::MusicManager(AccessEngine *vm) : _vm(vm) { _music = nullptr; _tempMusic = nullptr; _isLooping = false; diff --git a/engines/access/sound.h b/engines/access/sound.h index dc8bd90b85..ed8fe0b060 100644 --- a/engines/access/sound.h +++ b/engines/access/sound.h @@ -74,7 +74,6 @@ public: class MusicManager : public Audio::MidiPlayer { private: AccessEngine *_vm; - Audio::Mixer *_mixer; Resource *_tempMusic; @@ -85,7 +84,7 @@ public: Resource *_music; public: - MusicManager(AccessEngine *vm, Audio::Mixer *mixer); + MusicManager(AccessEngine *vm); ~MusicManager(); void midiPlay(); |