[Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,2.112,2.113
Max Horn
fingolfin at users.sourceforge.net
Mon May 19 04:35:04 CEST 2003
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm debugger.cpp,1.43,1.44 saveload.cpp,1.71,1.72 script.cpp,1.92,1.93 script_v5.cpp,1.84,1.85 scumm.h,1.200,1.201
- Next message: [Scummvm-cvs-logs] CVS: tools descumm.cpp,1.46,1.47 descumm6.cpp,1.104,1.105
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv1302
Modified Files:
gfx.cpp
Log Message:
more special palette fixes by erik
Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.112
retrieving revision 2.113
diff -u -d -r2.112 -r2.113
--- gfx.cpp 18 May 2003 23:45:34 -0000 2.112
+++ gfx.cpp 19 May 2003 11:34:13 -0000 2.113
@@ -3104,11 +3104,18 @@
int g = (int) (*curPtr++ * greenScale) >> 8;
int b = (int) (*curPtr++ * blueScale) >> 8;
+ if (r > 255)
+ r = 255;
+ if (g > 255)
+ g = 255;
+ if (b > 255)
+ b = 255;
+
searchPtr = palPtr + from * 3;
- bestResult = 32000;
+ bestResult = (uint)-1;
currentIndex = (byte) from;
- for (j = from; j < to; j++) {
+ for (j = from; j <= to; j++) {
int ar = (*searchPtr++);
int ag = (*searchPtr++);
int ab = (*searchPtr++);
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm debugger.cpp,1.43,1.44 saveload.cpp,1.71,1.72 script.cpp,1.92,1.93 script_v5.cpp,1.84,1.85 scumm.h,1.200,1.201
- Next message: [Scummvm-cvs-logs] CVS: tools descumm.cpp,1.46,1.47 descumm6.cpp,1.104,1.105
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list