diff options
| author | Filippos Karapetis | 2011-10-19 02:01:28 +0300 |
|---|---|---|
| committer | Filippos Karapetis | 2011-10-19 02:02:04 +0300 |
| commit | fa43ded59051b68f063dbd63783cb8d6a95aac8c (patch) | |
| tree | 29c43ff76c4b71bf5aa36244665a720fb2917708 /engines | |
| parent | d7f80fadab3f02725beb2d7ede5aef8cb13dc3d5 (diff) | |
| download | scummvm-rg350-fa43ded59051b68f063dbd63783cb8d6a95aac8c.tar.gz scummvm-rg350-fa43ded59051b68f063dbd63783cb8d6a95aac8c.tar.bz2 scummvm-rg350-fa43ded59051b68f063dbd63783cb8d6a95aac8c.zip | |
SCI: The draw_pic console command now works in SCI32
Moreover, the overlay is temporarily hidden to show the picture
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/sci/console.cpp | 14 | ||||
| -rw-r--r-- | engines/sci/graphics/picture.cpp | 2 |
2 files changed, 14 insertions, 2 deletions
diff --git a/engines/sci/console.cpp b/engines/sci/console.cpp index 2f69d5caa1..a44c661561 100644 --- a/engines/sci/console.cpp +++ b/engines/sci/console.cpp @@ -1498,10 +1498,22 @@ bool Console::cmdDrawPic(int argc, const char **argv) { return true; } - uint16 resourceId = atoi(argv[1]); +#ifndef USE_TEXT_CONSOLE_FOR_DEBUGGER + // If a graphical debugger overlay is used, hide it here, so that the + // results can be drawn. + g_system->hideOverlay(); +#endif + uint16 resourceId = atoi(argv[1]); _engine->_gfxPaint->kernelDrawPicture(resourceId, 100, false, false, false, 0); _engine->_gfxScreen->copyToScreen(); + _engine->sleep(2000); + +#ifndef USE_TEXT_CONSOLE_FOR_DEBUGGER + // Show the graphical debugger overlay + g_system->showOverlay(); +#endif + return true; } diff --git a/engines/sci/graphics/picture.cpp b/engines/sci/graphics/picture.cpp index 1c85ecddcf..bb326b1d2f 100644 --- a/engines/sci/graphics/picture.cpp +++ b/engines/sci/graphics/picture.cpp @@ -77,7 +77,7 @@ void GfxPicture::draw(int16 animationNr, bool mirroredFlag, bool addToFlag, int1 #ifdef ENABLE_SCI32 case 0x0e: // SCI32 VGA picture _resourceType = SCI_PICTURE_TYPE_SCI32; - //drawSci32Vga(); + drawSci32Vga(0, 0, 0, 0, 0, false); break; #endif default: |