thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make drawing & blitting always use the correct screen

Browse source 
(Always 16 color screen for vector stuff, 256 color screen for everything else in AGI256 mode).

svn-id: r27570
This commit is contained in:
Kari Salminen 2007-06-20 23:36:59 +00:00
parent d5822afe9e
commit dbac0054c1
3 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
engines/agi/checks.cpp
View file

@ -117,7 +117,7 @@ int AgiEngine::checkPriority(VtEntry *v) {
water = 1;
p0 = &_game.sbuf[v->xPos + v->yPos * _WIDTH];
p0 = &_game.sbuf16c[v->xPos + v->yPos * _WIDTH];
for (i = 0; i < v->xSize; i++, p0++) {
pri = *p0 >> 4;

4
engines/agi/picture.cpp
View file

@ -86,7 +86,7 @@ void PictureMgr::putVirtPixel(int x, int y) {
if (x < 0 || y < 0 || x >= _WIDTH || y >= _HEIGHT)
return;
p = &_vm->_game.sbuf[y * _WIDTH + x];
p = &_vm->_game.sbuf16c[y * _WIDTH + x];
if (priOn)
*p = (priColour << 4) | (*p & 0x0f);
@ -281,7 +281,7 @@ INLINE int PictureMgr::isOkFillHere(int x, int y) {
if (!scrOn && !priOn)
return false;
p = _vm->_game.sbuf[y * _WIDTH + x];
p = _vm->_game.sbuf16c[y * _WIDTH + x];
if (!priOn && scrOn && scrColour != 15)
return (p & 0x0f) == 15;

18
engines/agi/sprite.cpp
View file

@ -117,7 +117,11 @@ void SpritesMgr::blitPixel(uint8 *p, uint8 *end, uint8 col, int spr, int width,
/* Keep control line information visible, but put our
* priority over water (0x30) surface
*/
*p = (pr < 0x30 ? pr : spr) | col;
if (_vm->getFeatures() & (GF_AGI256 | GF_AGI256_2))
*(p + FROM_SBUF16_TO_SBUF256_OFFSET) = col; // Write to 256 color buffer
else
*p = (pr < 0x30 ? pr : spr) | col; // Write to 16 color (+control line/priority info) buffer
*hidden = false;
/* Except if our priority is 15, which should never happen
@ -151,9 +155,9 @@ int SpritesMgr::blitCel(int x, int y, int spr, ViewCel *c) {
t = c->transparency;
m = c->mirror;
spr <<= 4;
p0 = &_vm->_game.sbuf[x + y * _WIDTH + m * (c->width - 1)];
p0 = &_vm->_game.sbuf16c[x + y * _WIDTH + m * (c->width - 1)];
end = _vm->_game.sbuf + _WIDTH * _HEIGHT;
end = _vm->_game.sbuf16c + _WIDTH * _HEIGHT;
for (i = 0; i < c->height; i++) {
p = p0;
@ -629,8 +633,8 @@ void SpritesMgr::addToPic(int view, int loop, int cel, int x, int y, int pri, in
// don't let box extend below y.
if (y3 > y2) y3 = y2;
p1 = &_vm->_game.sbuf[x1 + y3 * _WIDTH];
p2 = &_vm->_game.sbuf[x2 + y3 * _WIDTH];
p1 = &_vm->_game.sbuf16c[x1 + y3 * _WIDTH];
p2 = &_vm->_game.sbuf16c[x2 + y3 * _WIDTH];
for (y = y3; y <= y2; y++) {
if ((*p1 >> 4) >= 4)
@ -642,8 +646,8 @@ void SpritesMgr::addToPic(int view, int loop, int cel, int x, int y, int pri, in
}
debugC(4, kDebugLevelSprites, "pri box: %d %d %d %d (%d)", x1, y3, x2, y2, mar);
p1 = &_vm->_game.sbuf[x1 + y3 * _WIDTH];
p2 = &_vm->_game.sbuf[x1 + y2 * _WIDTH];
p1 = &_vm->_game.sbuf16c[x1 + y3 * _WIDTH];
p2 = &_vm->_game.sbuf16c[x1 + y2 * _WIDTH];
for (x = x1; x <= x2; x++) {
if ((*p1 >> 4) >= 4)
*p1 = (mar << 4) | (*p1 & 0x0f);