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/scumm | |
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/scumm')
-rw-r--r-- | engines/scumm/gfx.cpp | 4 | ||||
-rw-r--r-- | engines/scumm/he/logic/football.cpp | 7 | ||||
-rw-r--r-- | engines/scumm/insane/insane_scenes.cpp | 2 |
3 files changed, 9 insertions, 4 deletions
diff --git a/engines/scumm/gfx.cpp b/engines/scumm/gfx.cpp index 2cf4a429db..ffff329036 100644 --- a/engines/scumm/gfx.cpp +++ b/engines/scumm/gfx.cpp @@ -755,7 +755,7 @@ void ScummEngine::drawStripToScreen(VirtScreen *vs, int x, int width, int top, i memset(blackbuf, 0, 16 * 240); // Prepare a buffer 16px wide and 240px high, to fit on a lateral strip width = 240; // Fix right strip - _system->copyRectToScreen((const byte *)blackbuf, 16, 0, 0, 16, 240); // Fix left strip + _system->copyRectToScreen(blackbuf, 16, 0, 0, 16, 240); // Fix left strip } } @@ -763,7 +763,7 @@ void ScummEngine::drawStripToScreen(VirtScreen *vs, int x, int width, int top, i } // Finally blit the whole thing to the screen - _system->copyRectToScreen((const byte *)src, pitch, x, y, width, height); + _system->copyRectToScreen(src, pitch, x, y, width, height); } // CGA diff --git a/engines/scumm/he/logic/football.cpp b/engines/scumm/he/logic/football.cpp index f67e07c475..b405d634a4 100644 --- a/engines/scumm/he/logic/football.cpp +++ b/engines/scumm/he/logic/football.cpp @@ -348,7 +348,12 @@ int LogicHEfootball2002::translateScreenToWorld(int32 *args) { } int LogicHEfootball2002::getDayOfWeek() { - // TODO: Get day of week, store in var 108 + // Get day of week, store in var 108 + + TimeDate time; + _vm->_system->getTimeAndDate(time); + writeScummVar(108, time.tm_wday); + return 1; } diff --git a/engines/scumm/insane/insane_scenes.cpp b/engines/scumm/insane/insane_scenes.cpp index 6db1cb5059..db0b0171bc 100644 --- a/engines/scumm/insane/insane_scenes.cpp +++ b/engines/scumm/insane/insane_scenes.cpp @@ -1386,7 +1386,7 @@ void Insane::postCase12(byte *renderBitmap, int32 codecparam, int32 setupsan12, break; case EN_TORQUE: turnBen(false); - if (_actor[1].y != 300) + if (_actor[1].y == 300) prepareScenePropScene(57, 1, 0); break; default: |