diff options
| author | Johannes Schickel | 2011-02-13 20:53:40 +0100 |
|---|---|---|
| committer | Johannes Schickel | 2011-02-14 17:08:33 +0100 |
| commit | f66009c6544ade60467634a50f2b2bb4de1a4f91 (patch) | |
| tree | 5b171bed3a84534b07f6ebcd473816697ae0f725 /engines/teenagent/teenagent.cpp | |
| parent | 02f93b4aeb1e80cff4c0bdb88004f1dd2de65228 (diff) | |
| download | scummvm-rg350-f66009c6544ade60467634a50f2b2bb4de1a4f91.tar.gz scummvm-rg350-f66009c6544ade60467634a50f2b2bb4de1a4f91.tar.bz2 scummvm-rg350-f66009c6544ade60467634a50f2b2bb4de1a4f91.zip | |
TEENAGENT: Adapt to setPalette RGBA->RGB change.
This change has not been tested.
Diffstat (limited to 'engines/teenagent/teenagent.cpp')
| -rw-r--r-- | engines/teenagent/teenagent.cpp | 38 |
1 files changed, 11 insertions, 27 deletions
diff --git a/engines/teenagent/teenagent.cpp b/engines/teenagent/teenagent.cpp index a492237adb..e66de70079 100644 --- a/engines/teenagent/teenagent.cpp +++ b/engines/teenagent/teenagent.cpp @@ -290,18 +290,12 @@ bool TeenAgentEngine::showCDLogo() { return true; byte bg[0xfa00]; - byte palette[0x400]; + byte palette[3*256]; cdlogo.read(bg, sizeof(bg)); - memset(palette, 0, sizeof(palette)); - - for(uint c = 0; c < 0x100; ++c) { - uint idx = c * 4; - cdlogo.read(palette + idx, 3); - palette[idx] *= 4; - palette[idx + 1] *= 4; - palette[idx + 2] *= 4; - } + cdlogo.read(palette, sizeof(palette)); + for (uint c = 0; c < 3*256; ++c) + palette[c] *= 4; _system->getPaletteManager()->setPalette(palette, 0, 0x100); _system->copyRectToScreen(bg, 320, 0, 0, 320, 200); _system->updateScreen(); @@ -323,22 +317,16 @@ bool TeenAgentEngine::showLogo() { return true; byte bg[0xfa00]; - byte palette[0x400]; + byte palette[3*256]; Common::ScopedPtr<Common::SeekableReadStream> frame(logo.getStream(1)); if (!frame) return true; frame->read(bg, sizeof(bg)); - memset(palette, 0, sizeof(palette)); - - for(uint c = 0; c < 0x100; ++c) { - uint idx = c * 4; - frame->read(palette + idx, 3); - palette[idx] *= 4; - palette[idx + 1] *= 4; - palette[idx + 2] *= 4; - } + frame->read(palette, sizeof(palette)); + for (uint c = 0; c < 3*256; ++c) + palette[c] *= 4; _system->getPaletteManager()->setPalette(palette, 0, 0x100); uint n = logo.fileCount(); @@ -375,16 +363,12 @@ bool TeenAgentEngine::showMetropolis() { FilePack varia; varia.open("varia.res"); - byte palette[0x400]; - memset(palette, 0, sizeof(palette)); + byte palette[3*256]; { Common::ScopedPtr<Common::SeekableReadStream> s(varia.getStream(5)); - for(uint c = 0; c < 0x400; c += 4) { - s->read(palette + c, 3); + s->read(palette, sizeof(palette)); + for (uint c = 0; c < 3*256; ++c) palette[c] *= 4; - palette[c + 1] *= 4; - palette[c + 2] *= 4; - } } _system->getPaletteManager()->setPalette(palette, 0, 0x100); |