[Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,2.418,2.419 gfx.h,1.109,1.110 scumm.cpp,1.385,1.386 usage_bits.cpp,1.13,1.14

Max Horn fingolfin at users.sourceforge.net
Thu Mar 24 18:00:22 CET 2005


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv841

Modified Files:
	gfx.cpp gfx.h scumm.cpp usage_bits.cpp 
Log Message:
Some more cleanup

Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.418
retrieving revision 2.419
diff -u -d -r2.418 -r2.419
--- gfx.cpp	25 Mar 2005 01:52:20 -0000	2.418
+++ gfx.cpp	25 Mar 2005 01:59:47 -0000	2.419
@@ -805,8 +805,6 @@
 
 	int s = _screenStartStrip + start;
 
-	assert(s >= 0 && (size_t) s < sizeof(gfxUsageBits) / (3 * sizeof(gfxUsageBits[0])));
-
 	for (int i = 0; i < num; i++)
 		setGfxUsageBit(s + i, USAGE_BIT_DIRTY);
 

Index: gfx.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.h,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -d -r1.109 -r1.110
--- gfx.h	25 Mar 2005 01:52:20 -0000	1.109
+++ gfx.h	25 Mar 2005 01:59:47 -0000	1.110
@@ -277,6 +277,7 @@
 	
 	int getZPlanes(const byte *smap_ptr, const byte *zplane_list[9], bool bmapImage) const;
 
+	StripTable *generateStripTable(const byte *src, int width, int height, StripTable *table) const;
 	void drawBitmapV2Helper(const byte *ptr, VirtScreen *vs, int x, int y, const int width, const int height, 
 	                int stripnr, int numstrip);
 
@@ -287,7 +288,6 @@
 	void drawBitmap(const byte *ptr, VirtScreen *vs, int x, int y, const int width, const int height,
 	                int stripnr, int numstrip, byte flag);
 
-	StripTable *generateStripTable(const byte *src, int width, int height, StripTable *table) const;
 	void decodeC64Gfx(const byte *src, byte *dst, int size) const;
 	void decodeNESGfx(const byte *room);
 	void decodeNESObject(const byte *ptr, int xpos, int ypos, int width, int height);

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.385
retrieving revision 1.386
diff -u -d -r1.385 -r1.386
--- scumm.cpp	25 Mar 2005 01:52:20 -0000	1.385
+++ scumm.cpp	25 Mar 2005 01:59:47 -0000	1.386
@@ -806,8 +806,6 @@
 
 	_doEffect = false;
 	memset(&_flashlight, 0, sizeof(_flashlight));
-	_compositeBuf = 0;
-	_herculesBuf = 0;
 	_bompActorPalettePtr = NULL;
 	_shakeEnabled = false;
 	_shakeFrame = 0;
@@ -1128,6 +1126,7 @@
 
 	_compositeBuf = (byte *)malloc(_screenWidth * _screenHeight);
 
+	_herculesBuf = 0;
 	if (_renderMode == Common::kRenderHercA || _renderMode == Common::kRenderHercG) {
 		_herculesBuf = (byte *)malloc(Common::kHercW * Common::kHercH);
 	}

Index: usage_bits.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/usage_bits.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- usage_bits.cpp	1 Jan 2005 16:09:16 -0000	1.13
+++ usage_bits.cpp	25 Mar 2005 01:59:47 -0000	1.14
@@ -41,18 +41,21 @@
 }
 
 void ScummEngine::setGfxUsageBit(int strip, int bit) {
+	assert(strip >= 0 && strip < ARRAYSIZE(gfxUsageBits) / 3);
 	assert(1 <= bit && bit <= 96);
 	bit--;
 	gfxUsageBits[3 * strip + bit / 32] |= (1 << (bit % 32));
 }
 
 void ScummEngine::clearGfxUsageBit(int strip, int bit) {
+	assert(strip >= 0 && strip < ARRAYSIZE(gfxUsageBits) / 3);
 	assert(1 <= bit && bit <= 96);
 	bit--;
 	gfxUsageBits[3 * strip + bit / 32] &= ~(1 << (bit % 32));
 }
 
 bool ScummEngine::testGfxUsageBit(int strip, int bit) {
+	assert(strip >= 0 && strip < ARRAYSIZE(gfxUsageBits) / 3);
 	assert(1 <= bit && bit <= 96);
 	bit--;
 	return (gfxUsageBits[3 * strip + bit / 32] & (1 << (bit % 32))) != 0;
@@ -63,6 +66,7 @@
 	uint32 bitmask[3] = { 0xFFFFFFFF, 0xFFFFFFFF, 0x3FFFFFFF };
 	int i;
 
+	assert(strip >= 0 && strip < ARRAYSIZE(gfxUsageBits) / 3);
 	for (i = 0; i < 3; i++)
 		if (gfxUsageBits[3 * strip + i] & bitmask[i])
 			return true;
@@ -75,6 +79,7 @@
 	uint32 bitmask[3] = { 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF };
 	int i;
 
+	assert(strip >= 0 && strip < ARRAYSIZE(gfxUsageBits) / 3);
 	assert(1 <= bit && bit <= 96);
 	bit--;
 	bitmask[bit / 32] &= ~(1 << (bit % 32));





More information about the Scummvm-git-logs mailing list