diff options
| author | Paul Gilbert | 2014-12-19 22:45:00 -0500 |
|---|---|---|
| committer | Paul Gilbert | 2014-12-19 22:45:00 -0500 |
| commit | 37b5ee24f520e46eae28c703d189939e0b18c65b (patch) | |
| tree | 9285dbd7ce831c98579fe3a340bd4d36cd5f8f49 /engines/access/martian/martian_game.cpp | |
| parent | 808a2045b4a3b210f1f2512617fe1be41c5dc460 (diff) | |
| download | scummvm-rg350-37b5ee24f520e46eae28c703d189939e0b18c65b.tar.gz scummvm-rg350-37b5ee24f520e46eae28c703d189939e0b18c65b.tar.bz2 scummvm-rg350-37b5ee24f520e46eae28c703d189939e0b18c65b.zip | |
ACCESS: Rename ASurface copyFrom methods to avoid clash with Graphics::Surface
Diffstat (limited to 'engines/access/martian/martian_game.cpp')
| -rw-r--r-- | engines/access/martian/martian_game.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/access/martian/martian_game.cpp b/engines/access/martian/martian_game.cpp index 6392206209..4e4a5135a6 100644 --- a/engines/access/martian/martian_game.cpp +++ b/engines/access/martian/martian_game.cpp @@ -100,8 +100,8 @@ void MartianEngine::doTitle() { _files->_setPaletteFlag = false; _files->loadScreen(0, 3); - _buffer2.copyFrom(*_screen); - _buffer1.copyFrom(*_screen); + _buffer2.blitFrom(*_screen); + _buffer1.blitFrom(*_screen); _screen->forceFadeIn(); _sound->playSound(1); @@ -115,13 +115,13 @@ void MartianEngine::doTitle() { _files->loadScreen(0, 4); _sound->playSound(1); - _buffer2.copyFrom(*_screen); - _buffer1.copyFrom(*_screen); + _buffer2.blitFrom(*_screen); + _buffer1.blitFrom(*_screen); _sound->playSound(1); const int COUNTDOWN[6] = { 2, 0x80, 1, 0x7d, 0, 0x87 }; for (_pCount = 0; _pCount < 3; ++_pCount) { - _buffer2.copyFrom(_buffer1); + _buffer2.blitFrom(_buffer1); int id = READ_LE_UINT16(COUNTDOWN + _pCount * 4); int xp = READ_LE_UINT16(COUNTDOWN + _pCount * 4 + 2); _screen->plotImage(_objectsTable[0], id, Common::Point(xp, 71)); |