aboutsummaryrefslogtreecommitdiff
path: root/engines/gob
diff options
context:
space:
mode:
authorSven Hesse2011-02-02 16:48:46 +0000
committerSven Hesse2011-02-02 16:48:46 +0000
commit113d5a5a9a633c7218b72328c4ad892a015fbed6 (patch)
treeb9462b8f846a30750dbde3eb0f29eab21e399e81 /engines/gob
parent076b9c9e534a1c83969a44d6893e56deffb4b6c1 (diff)
downloadscummvm-rg350-113d5a5a9a633c7218b72328c4ad892a015fbed6.tar.gz
scummvm-rg350-113d5a5a9a633c7218b72328c4ad892a015fbed6.tar.bz2
scummvm-rg350-113d5a5a9a633c7218b72328c4ad892a015fbed6.zip
GOB: Make flags optional in Video::initSurfDesc
svn-id: r55728
Diffstat (limited to 'engines/gob')
-rw-r--r--engines/gob/draw_fascin.cpp6
-rw-r--r--engines/gob/draw_v1.cpp2
-rw-r--r--engines/gob/inter_bargon.cpp2
-rw-r--r--engines/gob/mult_v1.cpp2
-rw-r--r--engines/gob/video.h2
5 files changed, 7 insertions, 7 deletions
diff --git a/engines/gob/draw_fascin.cpp b/engines/gob/draw_fascin.cpp
index 032a79c6cd..3f939e7790 100644
--- a/engines/gob/draw_fascin.cpp
+++ b/engines/gob/draw_fascin.cpp
@@ -485,7 +485,7 @@ void Draw_Fascination::drawWin(int16 fct) {
}
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);
int max = 0;
@@ -739,7 +739,7 @@ int16 Draw_Fascination::openWin(int16 id) {
_fascinWin[id].width = VAR((_winVarArrayWidth / 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);
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,
_fascinWin[id].left, _fascinWin[id].top,
_fascinWin[id].left + _fascinWin[id].width - 1,
diff --git a/engines/gob/draw_v1.cpp b/engines/gob/draw_v1.cpp
index 2a70110eeb..fd0fb8ae4f 100644
--- a/engines/gob/draw_v1.cpp
+++ b/engines/gob/draw_v1.cpp
@@ -44,7 +44,7 @@ Draw_v1::Draw_v1(GobEngine *vm) : Draw(vm) {
}
void Draw_v1::initScreen() {
- _backSurface = _vm->_video->initSurfDesc(320, 200, 0);
+ _backSurface = _vm->_video->initSurfDesc(320, 200);
_frontSurface = _vm->_global->_primarySurfDesc;
_cursorSprites = _vm->_video->initSurfDesc(32, 16, 2);
diff --git a/engines/gob/inter_bargon.cpp b/engines/gob/inter_bargon.cpp
index 9b26329bde..4dcdff8c6c 100644
--- a/engines/gob/inter_bargon.cpp
+++ b/engines/gob/inter_bargon.cpp
@@ -125,7 +125,7 @@ void Inter_Bargon::oBargon_intro2(OpGobParams &params) {
int16 comp[5] = { 0, 1, 2, 3, -1 };
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->_draw->_frontSurface->blit(*surface, 0, 0, 319, 199, 0, 0);
_vm->_video->drawPackedSprite("2ille4.ims", *surface);
diff --git a/engines/gob/mult_v1.cpp b/engines/gob/mult_v1.cpp
index 165953f42b..78ee3e60f5 100644
--- a/engines/gob/mult_v1.cpp
+++ b/engines/gob/mult_v1.cpp
@@ -316,7 +316,7 @@ void Mult_v1::playMultInit() {
multObj.lastBottom = -1;
}
- _animSurf = _vm->_video->initSurfDesc(320, 200, 0);
+ _animSurf = _vm->_video->initSurfDesc(320, 200);
_vm->_draw->_spritesArray[Draw::kAnimSurface] = _animSurf;
_animSurf->blit(*_vm->_draw->_backSurface, 0, 0, 319, 199, 0, 0);
diff --git a/engines/gob/video.h b/engines/gob/video.h
index 834582e026..8828b666b3 100644
--- a/engines/gob/video.h
+++ b/engines/gob/video.h
@@ -108,7 +108,7 @@ public:
int16 _screenDeltaY;
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);