diff options
| author | Sven Hesse | 2006-06-02 10:54:53 +0000 |
|---|---|---|
| committer | Sven Hesse | 2006-06-02 10:54:53 +0000 |
| commit | f3f7b670d0572b3355df6ada4e512ae60b488e51 (patch) | |
| tree | 2b46e565f36841c0e56dce30e1b4020486e65f39 /engines | |
| parent | 3d1cc0f7200f83fc654d8c623c684d8dff4079f4 (diff) | |
| download | scummvm-rg350-f3f7b670d0572b3355df6ada4e512ae60b488e51.tar.gz scummvm-rg350-f3f7b670d0572b3355df6ada4e512ae60b488e51.tar.bz2 scummvm-rg350-f3f7b670d0572b3355df6ada4e512ae60b488e51.zip | |
- Fixed IMD transparency
- Fixed SegFault due to uninitialized _multData2
- Removed left-over debug comment
svn-id: r22830
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/gob/game.cpp | 4 | ||||
| -rw-r--r-- | engines/gob/mult_v2.cpp | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/engines/gob/game.cpp b/engines/gob/game.cpp index 39c9fd537c..d69a1b8dad 100644 --- a/engines/gob/game.cpp +++ b/engines/gob/game.cpp @@ -2389,7 +2389,7 @@ int16 Game::viewImd(Game::Imd *imdPtr, int16 frame) { retVal |= *_imdFrameData; if (imdPtr->surfDesc == 0) continue; - if (!(_vm->_video->_extraMode && (imdPtr->surfDesc->vidMode == 0x13))) // MODIFIED... NOT! + if (!(_vm->_video->_extraMode && (imdPtr->surfDesc->vidMode == 0x13))) imdRenderFrame(imdPtr); else warning("GOB2 Stub! viedImd, sub_2C69A(imdPtr);"); @@ -2431,7 +2431,7 @@ void Game::imdDrawFrame(Imd *imdPtr, int16 frame, int16 x, int16 y) { y + imdPtr->stdY, 1); else _vm->_video->drawSprite(imdPtr->surfDesc, _vm->_draw->_frontSurface, 0, 0, - imdPtr->width - 1, imdPtr->height - 1, x, y, 1); + imdPtr->width - 1, imdPtr->height - 1, x, y, 0); } void Game::imdRenderFrame(Imd *imdPtr) { diff --git a/engines/gob/mult_v2.cpp b/engines/gob/mult_v2.cpp index e199df4a95..5b420ec668 100644 --- a/engines/gob/mult_v2.cpp +++ b/engines/gob/mult_v2.cpp @@ -41,6 +41,7 @@ namespace Gob { Mult_v2::Mult_v2(GobEngine *vm) : Mult_v1(vm) { int i; + _multData2 = 0; for (i = 0; i < 8; i++) _multDatas[i] = 0; } |