libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-31 07:53:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GOB: Make flags optional in Video::initSurfDesc

Browse Source 
svn-id: r55728
This commit is contained in:
Sven Hesse 2011-02-02 16:48:46 +00:00
parent 076b9c9e53
commit 113d5a5a9a
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engines/gob/draw_fascin.cpp
View File

@ -485,7 +485,7 @@ void Draw_Fascination::drawWin(int16 fct) {
} }
if (found) { if (found) {
tempSrf = _vm->_video->initSurfDesc(width - left + 1, height - top + 1, 0); tempSrf = _vm->_video->initSurfDesc(width - left + 1, height - top + 1);
tempSrf->blit(*_backSurface, left, top, width, height, 0, 0); tempSrf->blit(*_backSurface, left, top, width, height, 0, 0);
int max = 0; int max = 0;
@ -739,7 +739,7 @@ int16 Draw_Fascination::openWin(int16 id) {
_fascinWin[id].width = VAR((_winVarArrayWidth / 4) + id); _fascinWin[id].width = VAR((_winVarArrayWidth / 4) + id);
_fascinWin[id].height = VAR((_winVarArrayHeight / 4) + id); _fascinWin[id].height = VAR((_winVarArrayHeight / 4) + id);
_fascinWin[id].savedSurface = _vm->_video->initSurfDesc(_winMaxWidth + 7, _winMaxHeight, 0); _fascinWin[id].savedSurface = _vm->_video->initSurfDesc(_winMaxWidth + 7, _winMaxHeight);
saveWin(id); saveWin(id);
WRITE_VAR((_winVarArrayStatus / 4) + id, VAR((_winVarArrayStatus / 4) + id) & 0xFFFFFFFE); WRITE_VAR((_winVarArrayStatus / 4) + id, VAR((_winVarArrayStatus / 4) + id) & 0xFFFFFFFE);
@ -961,7 +961,7 @@ void Draw_Fascination::activeWin(int16 id) {
} }
} }
tempSrf = _vm->_video->initSurfDesc(_winMaxWidth + 7, _winMaxHeight, 0); tempSrf = _vm->_video->initSurfDesc(_winMaxWidth + 7, _winMaxHeight);
tempSrf->blit(*_backSurface, tempSrf->blit(*_backSurface,
_fascinWin[id].left, _fascinWin[id].top, _fascinWin[id].left, _fascinWin[id].top,
_fascinWin[id].left + _fascinWin[id].width - 1, _fascinWin[id].left + _fascinWin[id].width - 1,

2
engines/gob/draw_v1.cpp
View File

@ -44,7 +44,7 @@ Draw_v1::Draw_v1(GobEngine *vm) : Draw(vm) {
} }
void Draw_v1::initScreen() { void Draw_v1::initScreen() {
_backSurface = _vm->_video->initSurfDesc(320, 200, 0); _backSurface = _vm->_video->initSurfDesc(320, 200);
_frontSurface = _vm->_global->_primarySurfDesc; _frontSurface = _vm->_global->_primarySurfDesc;
_cursorSprites = _vm->_video->initSurfDesc(32, 16, 2); _cursorSprites = _vm->_video->initSurfDesc(32, 16, 2);

2
engines/gob/inter_bargon.cpp
View File

@ -125,7 +125,7 @@ void Inter_Bargon::oBargon_intro2(OpGobParams &params) {
int16 comp[5] = { 0, 1, 2, 3, -1 }; int16 comp[5] = { 0, 1, 2, 3, -1 };
static const char *sndFiles[] = {"1INTROII.snd", "2INTROII.snd", "1INTRO3.snd", "2INTRO3.snd"}; static const char *sndFiles[] = {"1INTROII.snd", "2INTROII.snd", "1INTRO3.snd", "2INTRO3.snd"};
surface = _vm->_video->initSurfDesc(320, 200, 0); surface = _vm->_video->initSurfDesc(320, 200);
_vm->_video->drawPackedSprite("2ille.ims", *surface); _vm->_video->drawPackedSprite("2ille.ims", *surface);
_vm->_draw->_frontSurface->blit(*surface, 0, 0, 319, 199, 0, 0); _vm->_draw->_frontSurface->blit(*surface, 0, 0, 319, 199, 0, 0);
_vm->_video->drawPackedSprite("2ille4.ims", *surface); _vm->_video->drawPackedSprite("2ille4.ims", *surface);

2
engines/gob/mult_v1.cpp
View File

@ -316,7 +316,7 @@ void Mult_v1::playMultInit() {
multObj.lastBottom = -1; multObj.lastBottom = -1;
} }
_animSurf = _vm->_video->initSurfDesc(320, 200, 0); _animSurf = _vm->_video->initSurfDesc(320, 200);
_vm->_draw->_spritesArray[Draw::kAnimSurface] = _animSurf; _vm->_draw->_spritesArray[Draw::kAnimSurface] = _animSurf;
_animSurf->blit(*_vm->_draw->_backSurface, 0, 0, 319, 199, 0, 0); _animSurf->blit(*_vm->_draw->_backSurface, 0, 0, 319, 199, 0, 0);

2
engines/gob/video.h
View File

@ -108,7 +108,7 @@ public:
int16 _screenDeltaY; int16 _screenDeltaY;
void initPrimary(int16 mode); void initPrimary(int16 mode);
SurfacePtr initSurfDesc(int16 width, int16 height, int16 flags); SurfacePtr initSurfDesc(int16 width, int16 height, int16 flags = 0);
void setSize(bool defaultTo1XScaler); void setSize(bool defaultTo1XScaler);