diff options
| author | Matthew Hoops | 2012-06-24 09:37:53 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2012-06-24 09:37:53 -0400 |
| commit | 91efe792d5b231752dd16888729a94f323363fa0 (patch) | |
| tree | e7346f83d4966ff4f3cf7e593a7f0cfa16c45b20 /engines/teenagent/scene.cpp | |
| parent | 915a8399c910fb5c8e35de58857ce1577c1a0151 (diff) | |
| parent | 20b677080881580706652b17dd5a4c3ed3e36c07 (diff) | |
| download | scummvm-rg350-91efe792d5b231752dd16888729a94f323363fa0.tar.gz scummvm-rg350-91efe792d5b231752dd16888729a94f323363fa0.tar.bz2 scummvm-rg350-91efe792d5b231752dd16888729a94f323363fa0.zip | |
Merge remote branch 'upstream/master' into pegasus
Diffstat (limited to 'engines/teenagent/scene.cpp')
| -rw-r--r-- | engines/teenagent/scene.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/teenagent/scene.cpp b/engines/teenagent/scene.cpp index e8c2dec4fa..038c8ea05e 100644 --- a/engines/teenagent/scene.cpp +++ b/engines/teenagent/scene.cpp @@ -423,7 +423,7 @@ void Scene::init(int id, const Common::Point &pos) { if (now_playing != res->dseg.get_byte(0xDB90)) _engine->music->load(res->dseg.get_byte(0xDB90)); - _system->copyRectToScreen((const byte *)background.pixels, background.pitch, 0, 0, background.w, background.h); + _system->copyRectToScreen(background.pixels, background.pitch, 0, 0, background.w, background.h); setPalette(0); } @@ -654,7 +654,7 @@ bool Scene::render(bool tick_game, bool tick_mark, uint32 delta) { } if (background.pixels && debug_features.feature[DebugFeatures::kShowBack]) { - _system->copyRectToScreen((const byte *)background.pixels, background.pitch, 0, 0, background.w, background.h); + _system->copyRectToScreen(background.pixels, background.pitch, 0, 0, background.w, background.h); } else _system->fillScreen(0); |