[Scummvm-cvs-logs] SF.net SVN: scummvm: [25035] scummvm/trunk/engines/agi

[dsx at users.sourceforge.net]

Revision: 25035
          http://scummvm.svn.sourceforge.net/scummvm/?rev=25035&view=rev
Author:   dsx
Date:     2007-01-06 09:17:27 -0800 (Sat, 06 Jan 2007)

Log Message:
-----------
More hires removal, this time from sprites.

Modified Paths:
--------------
    scummvm/trunk/engines/agi/sprite.cpp
    scummvm/trunk/engines/agi/sprite.h

Modified: scummvm/trunk/engines/agi/sprite.cpp
===================================================================
--- scummvm/trunk/engines/agi/sprite.cpp	2007-01-06 17:11:08 UTC (rev 25034)
+++ scummvm/trunk/engines/agi/sprite.cpp	2007-01-06 17:17:27 UTC (rev 25035)
@@ -134,40 +134,6 @@
 }
 
 
-#define X_FACT 2		/* Horizontal hires factor */
-
-int SpritesMgr::blit_hires_cel(int x, int y, int spr, view_cel *c) {
-	uint8 *q = NULL;
-	uint8 *h0, *h, *end;
-	int i, j, t, m, col;
-	int hidden = true;
-
-	q = c->data;
-	t = c->transparency;
-	m = c->mirror;
-	spr <<= 4;
-	h0 = &_vm->game.hires[(x + y * _WIDTH + m * (c->width - 1)) * X_FACT];
-
-	end = _vm->game.hires + _WIDTH * X_FACT * _HEIGHT;
-
-	for (i = 0; i < c->height; i++) {
-		h = h0;
-		while (*q) {
-			col = (*q & 0xf0) >> 4;
-			for (j = *q & 0x0f; j; j--, h += X_FACT * (1 - 2 * m)) {
-				if (col != t) {
-					blit_pixel(h, end, col, spr, _WIDTH * X_FACT, &hidden);
-					blit_pixel(h + 1, end, col, spr, _WIDTH * X_FACT, &hidden);
-				}
-			}
-			q++;
-		}
-		h0 += _WIDTH * X_FACT;
-		q++;
-	}
-	return hidden;
-}
-
 int SpritesMgr::blit_cel(int x, int y, int spr, view_cel *c) {
 	uint8 *p0, *p, *q = NULL, *end;
 	int i, j, t, m, col;
@@ -183,9 +149,6 @@
 	if (x >= _WIDTH)
 		x = _WIDTH - 1;
 
-	if (_vm->opt.hires)
-		blit_hires_cel(x, y, spr, c);
-
 	q = c->data;
 	t = c->transparency;
 	m = c->mirror;
@@ -289,9 +252,6 @@
 		q += x_size;
 		p0 += _WIDTH;
 		memcpy(h0, k, x_size * 2);
-		if (_vm->opt.hires) {
-			_gfx->putPixelsHires(x_pos * 2, y_pos + y + offset, x_size * 2, h0);
-		}
 		k += x_size * 2;
 		h0 += _WIDTH * 2;
 	}
@@ -789,9 +749,6 @@
 	for (i = y1; i <= y2; i++) {
 		_gfx->putPixelsA(x1, i + offset, w, q);
 		q += _WIDTH;
-		if (_vm->opt.hires) {
-			_gfx->putPixelsHires(x1 * 2, i + offset, w * 2, h);
-		}
 		h += _WIDTH * 2;
 	}
 

Modified: scummvm/trunk/engines/agi/sprite.h
===================================================================
--- scummvm/trunk/engines/agi/sprite.h	2007-01-06 17:11:08 UTC (rev 25034)
+++ scummvm/trunk/engines/agi/sprite.h	2007-01-06 17:17:27 UTC (rev 25035)
@@ -55,7 +55,6 @@
 	void *pool_alloc(int size);
 	void pool_release(void *s);
 	void blit_pixel(uint8 *p, uint8 *end, uint8 col, int spr, int width, int *hidden);
-	int blit_hires_cel(int x, int y, int spr, view_cel *c);
 	int blit_cel(int x, int y, int spr, view_cel *c);
 	void objs_savearea(sprite *s);
 	void objs_restorearea(sprite *s);


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