diff options
| author | Johannes Schickel | 2011-11-16 18:06:30 +0100 |
|---|---|---|
| committer | Johannes Schickel | 2011-11-16 18:06:30 +0100 |
| commit | 61795739f8f45c5de4cfd0fe57af459146c5173c (patch) | |
| tree | 5ff6bcde25f40545d1768f623804ba44afce4b6e /engines/lure | |
| parent | 6e90f9e6938c9727a3dbb552b74f0d40d0ab221f (diff) | |
| download | scummvm-rg350-61795739f8f45c5de4cfd0fe57af459146c5173c.tar.gz scummvm-rg350-61795739f8f45c5de4cfd0fe57af459146c5173c.tar.bz2 scummvm-rg350-61795739f8f45c5de4cfd0fe57af459146c5173c.zip | |
COMMON: Rename Common::set_to to Common::fill.
This makes the name match with the name of the STL function with the same
behavior.
Diffstat (limited to 'engines/lure')
| -rw-r--r-- | engines/lure/res.cpp | 2 | ||||
| -rw-r--r-- | engines/lure/room.cpp | 2 | ||||
| -rw-r--r-- | engines/lure/sound.cpp | 10 |
3 files changed, 7 insertions, 7 deletions
diff --git a/engines/lure/res.cpp b/engines/lure/res.cpp index fbf9f33b87..6328301233 100644 --- a/engines/lure/res.cpp +++ b/engines/lure/res.cpp @@ -408,7 +408,7 @@ byte *Resources::getCursor(uint8 cursorNum) { if (!LureEngine::getReference().isEGA()) return _cursors->data() + (cursorNum * CURSOR_SIZE); - Common::set_to(&_cursor[0], &_cursor[0] + CURSOR_SIZE, 0); + Common::fill(&_cursor[0], &_cursor[0] + CURSOR_SIZE, 0); byte *pSrc = _cursors->data() + (cursorNum * 64); byte *pDest = &_cursor[0]; diff --git a/engines/lure/room.cpp b/engines/lure/room.cpp index 2cb871d73f..219ed0263d 100644 --- a/engines/lure/room.cpp +++ b/engines/lure/room.cpp @@ -43,7 +43,7 @@ RoomLayer::RoomLayer(uint16 screenId, bool backgroundLayer): int cellIndex = 0; // Reset all the cells to unused - Common::set_to((uint8 *) _cells, (uint8 *) _cells + GRID_SIZE, 0xff); + Common::fill((uint8 *) _cells, (uint8 *) _cells + GRID_SIZE, 0xff); // Load up the screen data MemoryBlock *rawData = disk.getEntry(screenId); diff --git a/engines/lure/sound.cpp b/engines/lure/sound.cpp index 85b86a8400..0aecae22ec 100644 --- a/engines/lure/sound.cpp +++ b/engines/lure/sound.cpp @@ -53,7 +53,7 @@ SoundManager::SoundManager() { _isRoland = MidiDriver::getMusicType(dev) != MT_ADLIB; _nativeMT32 = ((MidiDriver::getMusicType(dev) == MT_MT32) || ConfMan.getBool("native_mt32")); - Common::set_to(_channelsInUse, _channelsInUse + NUM_CHANNELS, false); + Common::fill(_channelsInUse, _channelsInUse + NUM_CHANNELS, false); _driver = MidiDriver::createMidi(dev); int statusCode = _driver->open(); @@ -182,7 +182,7 @@ void SoundManager::killSounds() { // Clear the active sounds _activeSounds.clear(); - Common::set_to(_channelsInUse, _channelsInUse + NUM_CHANNELS, false); + Common::fill(_channelsInUse, _channelsInUse + NUM_CHANNELS, false); } void SoundManager::addSound(uint8 soundIndex, bool tidyFlag) { @@ -221,7 +221,7 @@ void SoundManager::addSound(uint8 soundIndex, bool tidyFlag) { } // Mark the found channels as in use - Common::set_to(_channelsInUse+channelCtr, _channelsInUse+channelCtr + numChannels, true); + Common::fill(_channelsInUse+channelCtr, _channelsInUse+channelCtr + numChannels, true); SoundDescResource *newEntry = new SoundDescResource(); newEntry->soundNumber = rec.soundNumber; @@ -342,7 +342,7 @@ void SoundManager::tidySounds() { ++i; else { // Mark the channels that it used as now being free - Common::set_to(_channelsInUse+rec->channel, _channelsInUse+rec->channel+rec->numChannels, false); + Common::fill(_channelsInUse+rec->channel, _channelsInUse+rec->channel+rec->numChannels, false); i = _activeSounds.erase(i); } @@ -373,7 +373,7 @@ void SoundManager::restoreSounds() { SoundDescResource *rec = (*i).get(); if ((rec->numChannels != 0) && ((rec->flags & SF_RESTORE) != 0)) { - Common::set_to(_channelsInUse+rec->channel, _channelsInUse+rec->channel+rec->numChannels, true); + Common::fill(_channelsInUse+rec->channel, _channelsInUse+rec->channel+rec->numChannels, true); musicInterface_Play(rec->soundNumber, rec->channel, rec->numChannels); musicInterface_SetVolume(rec->channel, rec->volume); |