[Scummvm-cvs-logs] CVS: scummvm/scumm costume.cpp,1.169,1.170
Eugene Sandulenko
sev at users.sourceforge.net
Sat Mar 26 15:40:42 CET 2005
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/doc readme.tex,1.6.2.1,1.6.2.2
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.328,1.329 akos.h,1.34,1.35 base-costume.cpp,2.26,2.27 base-costume.h,1.35,1.36 costume.cpp,1.170,1.171 costume.h,1.33,1.34 scumm.cpp,1.387,1.388 scumm.h,1.548,1.549
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19279
Modified Files:
costume.cpp
Log Message:
Gray actor palettes in flahslight mode for NES from Quietust.
Index: costume.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/costume.cpp,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -d -r1.169 -r1.170
--- costume.cpp 26 Mar 2005 03:49:06 -0000 1.169
+++ costume.cpp 26 Mar 2005 23:40:01 -0000 1.170
@@ -664,6 +664,8 @@
}
void CostumeRenderer::drawNESCostume(const Actor *a, int limb) {
+ const byte darkpalette[16] = {0x00,0x00,0x2D,0x3D,0x00,0x00,0x2D,0x3D,0x00,0x00,0x2D,0x3D,0x00,0x00,0x2D,0x3D};
+ const byte *palette;
const byte *src;
int offset, numSprites;
const byte *table, *ptr, *spritesDefs, *spritesOffsetTab, *numSpritesTab;
@@ -673,6 +675,11 @@
byte *bgTransBuf = _vm->getMaskBuffer(0, 0, 0);
byte *gfxMaskBuf = _vm->getMaskBuffer(0, 0, 1);
+ if (_vm->VAR(_vm->VAR_CURRENT_LIGHTS) & LIGHTMODE_actor_color)
+ palette = _vm->_NESPalette[1];
+ else
+ palette = darkpalette;
+
src = _loaded._dataOffsets;
// Cost(a)
@@ -699,7 +706,7 @@
byte mask = (ptr[0] & 0x80) ? 0x01 : 0x80;
int8 y = ptr[0] << 1; y >>= 1;
byte tile = ptr[1];
- byte palette = (ptr[2] & 0x03) << 2;
+ byte sprpal = (ptr[2] & 0x03) << 2;
int8 x = ptr[2]; x >>= 2;
ptr += 3;
@@ -721,7 +728,7 @@
byte c2 = _vm->_NESPatTable[0][tile * 16 + ty + 8];
for (int tx = 0; tx < 8; tx++) {
- unsigned char c = ((c1 & mask) ? 1 : 0) | ((c2 & mask) ? 2 : 0) | palette;
+ unsigned char c = ((c1 & mask) ? 1 : 0) | ((c2 & mask) ? 2 : 0) | sprpal;
if (mask == 0x01) {
c1 >>= 1;
c2 >>= 1;
@@ -734,7 +741,7 @@
int my = _actorY + y + ty;
int mx = _actorX + x + tx;
if (!doMask || !(bgTransBuf[my * _numStrips + mx / 8] & (0x80 >> (mx & 7))))
- *((byte *)_out.pixels + my * _out.pitch + mx) = _vm->_NESPalette[1][c];
+ *((byte *)_out.pixels + my * _out.pitch + mx) = palette[c];
}
}
if (left > _actorX + x)
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/doc readme.tex,1.6.2.1,1.6.2.2
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.328,1.329 akos.h,1.34,1.35 base-costume.cpp,2.26,2.27 base-costume.h,1.35,1.36 costume.cpp,1.170,1.171 costume.h,1.33,1.34 scumm.cpp,1.387,1.388 scumm.h,1.548,1.549
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list