diff options
| author | Kamil Zbróg | 2014-01-27 21:43:05 +0100 |
|---|---|---|
| committer | Kamil Zbróg | 2014-01-27 21:43:05 +0100 |
| commit | 8eac80cfc59c34299899ebe18a3b0582ef76e0d2 (patch) | |
| tree | 5d02a8fba0559c16f2a2045b14e3e292509c6924 /engines/sci/graphics | |
| parent | 444934a0accec982f55db92c17ef65270fe18e66 (diff) | |
| parent | 0f5eeaed7b3c9d2f74eee7dff2114c5f4dc63f00 (diff) | |
| download | scummvm-rg350-8eac80cfc59c34299899ebe18a3b0582ef76e0d2.tar.gz scummvm-rg350-8eac80cfc59c34299899ebe18a3b0582ef76e0d2.tar.bz2 scummvm-rg350-8eac80cfc59c34299899ebe18a3b0582ef76e0d2.zip | |
Merge remote-tracking branch 'sync/master' into prince-malik
Diffstat (limited to 'engines/sci/graphics')
| -rw-r--r-- | engines/sci/graphics/picture.cpp | 2 | ||||
| -rw-r--r-- | engines/sci/graphics/ports.cpp | 5 |
2 files changed, 0 insertions, 7 deletions
diff --git a/engines/sci/graphics/picture.cpp b/engines/sci/graphics/picture.cpp index 374f7208d8..caab1d80da 100644 --- a/engines/sci/graphics/picture.cpp +++ b/engines/sci/graphics/picture.cpp @@ -283,8 +283,6 @@ void GfxPicture::drawCelData(byte *inbuffer, int size, int headerPos, int rlePos // That needs to be done cause a mirrored picture may be requested pixelCount = width * height; celBitmap = new byte[pixelCount]; - if (!celBitmap) - error("Unable to allocate temporary memory for picture drawing"); if (g_sci->getPlatform() == Common::kPlatformMacintosh && getSciVersion() >= SCI_VERSION_2) { // See GfxView::unpackCel() for why this black/white swap is done diff --git a/engines/sci/graphics/ports.cpp b/engines/sci/graphics/ports.cpp index 6d9dc03195..ed0013b491 100644 --- a/engines/sci/graphics/ports.cpp +++ b/engines/sci/graphics/ports.cpp @@ -300,11 +300,6 @@ Window *GfxPorts::addWindow(const Common::Rect &dims, const Common::Rect *restor Window *pwnd = new Window(id); Common::Rect r; - if (!pwnd) { - error("Can't open window"); - return 0; - } - _windowsById[id] = pwnd; // KQ1sci, KQ4, iceman, QfG2 always add windows to the back of the list. |