libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-05 17:57:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

First step at getting the magnifier and memory view corrected

Browse Source 
svn-id: r35389
This commit is contained in:
Sven Hesse 2008-12-16 02:57:48 +00:00
parent 45842bf9e2
commit c45f149ea1
3 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
engines/gob/coktelvideo.cpp
View File

@ -1522,6 +1522,7 @@ void Vmd::blit(byte *dest, byte *src, int16 width, int16 height) {
void Vmd::blit16(byte *dest, uint16 *src, int16 width, int16 height) {
int16 vWidth = _width >> 1;
width >>= 1;
assert(_palLUT);

19
engines/gob/videoplayer.cpp
View File

@ -247,10 +247,25 @@ bool VideoPlayer::primaryOpen(const char *videoFile, int16 x, int16 y,
}
if (!(flags & kFlagNoVideo)) {
_backSurf = ((flags & kFlagFrontSurface) == 0);
SurfaceDesc::Ptr surf = _vm->_draw->_spritesArray[_backSurf ? 21 : 20];
SurfaceDesc::Ptr surf;
if (flags & kFlagOtherSurface) {
_backSurf = false;
surf = _vm->_video->initSurfDesc(_vm->_global->_videoMode,
_primaryVideo->getVideo()->getWidth(),
_primaryVideo->getVideo()->getHeight(), 0);
_vm->_draw->_spritesArray[x] = surf;
x = 0;
} else {
_backSurf = ((flags & kFlagFrontSurface) == 0);
surf = _vm->_draw->_spritesArray[_backSurf ? 21 : 20];
}
_primaryVideo->getVideo()->setVideoMemory(surf->getVidMem(),
surf->getWidth(), surf->getHeight());
} else
_primaryVideo->getVideo()->setVideoMemory();

3
engines/gob/videoplayer.h
View File

@ -41,7 +41,8 @@ public:
kFlagNone = 0,
kFlagUseBackSurfaceContent = 0x40,
kFlagFrontSurface = 0x80,
kFlagNoVideo = 0x100
kFlagNoVideo = 0x100,
kFlagOtherSurface = 0x800
};
enum Type {