[Scummvm-cvs-logs] CVS: scummvm/scumm costume.cpp,1.26,1.27
Pawel Kolodziejski
aquadran at users.sourceforge.net
Tue Apr 22 13:00:24 CEST 2003
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv10339
Modified Files:
costume.cpp
Log Message:
corrections for setting actor palette
Index: costume.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/costume.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- costume.cpp 22 Apr 2003 18:57:10 -0000 1.26
+++ costume.cpp 22 Apr 2003 19:59:30 -0000 1.27
@@ -1317,23 +1317,28 @@
byte color;
if (_vm->_features & GF_OLD_BUNDLE) {
- for (i = 0; i < _loaded._numColors; i++) {
- _palette[i] = i;
- }
- _palette[_loaded._ptr[8]] = palette[0];
- // TODO / FIXME
- return;
- }
-
- for (i = 0; i < _loaded._numColors; i++) {
- if ((_vm->_vars[_vm->VAR_CURRENT_LIGHTS] & LIGHTMODE_actor_color) || (_vm->_features & GF_AFTER_V6)) {
- color = palette[i];
- if (color == 255)
- color = _loaded._ptr[8 + i];
+ palette[_loaded._ptr[8]] = palette[0];
+ if ((_vm->_vars[_vm->VAR_CURRENT_LIGHTS] & LIGHTMODE_actor_color)) {
+ for (i = 0; i < 16; i++) {
+ _palette[i] = palette[i];
+ }
} else {
- color = (i == 12) ? 0 : 8;
+ for (i = 0; i < 16; i++) {
+ _palette[i] = 8;
+ }
+ _palette[12] = 0;
+ }
+ } else {
+ for (i = 0; i < _loaded._numColors; i++) {
+ if ((_vm->_vars[_vm->VAR_CURRENT_LIGHTS] & LIGHTMODE_actor_color) || (_vm->_features & GF_AFTER_V6)) {
+ color = palette[i];
+ if (color == 255)
+ color = _loaded._ptr[8 + i];
+ } else {
+ color = (i == 12) ? 0 : 8;
+ }
+ _palette[i] = color;
}
- _palette[i] = color;
}
}
More information about the Scummvm-git-logs
mailing list