[Scummvm-cvs-logs] SF.net SVN: scummvm:[55728] scummvm/trunk/engines/gob

[drmccoy at users.sourceforge.net]

Revision: 55728
          http://scummvm.svn.sourceforge.net/scummvm/?rev=55728&view=rev
Author:   drmccoy
Date:     2011-02-02 16:48:46 +0000 (Wed, 02 Feb 2011)

Log Message:
-----------
GOB: Make flags optional in Video::initSurfDesc

Modified Paths:
--------------
    scummvm/trunk/engines/gob/draw_fascin.cpp
    scummvm/trunk/engines/gob/draw_v1.cpp
    scummvm/trunk/engines/gob/inter_bargon.cpp
    scummvm/trunk/engines/gob/mult_v1.cpp
    scummvm/trunk/engines/gob/video.h

Modified: scummvm/trunk/engines/gob/draw_fascin.cpp
===================================================================
--- scummvm/trunk/engines/gob/draw_fascin.cpp	2011-02-02 16:48:04 UTC (rev 55727)
+++ scummvm/trunk/engines/gob/draw_fascin.cpp	2011-02-02 16:48:46 UTC (rev 55728)
@@ -485,7 +485,7 @@
 	}
 
 	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 @@
 	_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 @@
 			}
 		}
 
-		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,

Modified: scummvm/trunk/engines/gob/draw_v1.cpp
===================================================================
--- scummvm/trunk/engines/gob/draw_v1.cpp	2011-02-02 16:48:04 UTC (rev 55727)
+++ scummvm/trunk/engines/gob/draw_v1.cpp	2011-02-02 16:48:46 UTC (rev 55728)
@@ -44,7 +44,7 @@
 }
 
 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);

Modified: scummvm/trunk/engines/gob/inter_bargon.cpp
===================================================================
--- scummvm/trunk/engines/gob/inter_bargon.cpp	2011-02-02 16:48:04 UTC (rev 55727)
+++ scummvm/trunk/engines/gob/inter_bargon.cpp	2011-02-02 16:48:46 UTC (rev 55728)
@@ -125,7 +125,7 @@
 	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);

Modified: scummvm/trunk/engines/gob/mult_v1.cpp
===================================================================
--- scummvm/trunk/engines/gob/mult_v1.cpp	2011-02-02 16:48:04 UTC (rev 55727)
+++ scummvm/trunk/engines/gob/mult_v1.cpp	2011-02-02 16:48:46 UTC (rev 55728)
@@ -316,7 +316,7 @@
 			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);

Modified: scummvm/trunk/engines/gob/video.h
===================================================================
--- scummvm/trunk/engines/gob/video.h	2011-02-02 16:48:04 UTC (rev 55727)
+++ scummvm/trunk/engines/gob/video.h	2011-02-02 16:48:46 UTC (rev 55728)
@@ -108,7 +108,7 @@
 	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);
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.