[Scummvm-cvs-logs] CVS: scummvm/scumm palette.cpp,2.5,2.6 scumm.cpp,1.83,1.84
Travis Howell
kirben at users.sourceforge.net
Sat Jul 10 20:47:14 CEST 2004
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25437/scumm
Modified Files:
palette.cpp scumm.cpp
Log Message:
Color cycling is only used in SCUMM 4+ games.
Index: palette.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/palette.cpp,v
retrieving revision 2.5
retrieving revision 2.6
diff -u -d -r2.5 -r2.6
--- palette.cpp 28 Feb 2004 12:58:10 -0000 2.5
+++ palette.cpp 11 Jul 2004 03:46:32 -0000 2.6
@@ -271,18 +271,9 @@
int valueToAdd;
int i, j;
- if (VAR_TIMER == 0xFF) {
- // FIXME - no idea if this is right :-/
- // Needed for both V2 and V8 at this time
+ valueToAdd = VAR(VAR_TIMER);
+ if (valueToAdd < VAR(VAR_TIMER_NEXT))
valueToAdd = VAR(VAR_TIMER_NEXT);
- } else {
- valueToAdd = VAR(VAR_TIMER);
- if (valueToAdd < VAR(VAR_TIMER_NEXT))
- valueToAdd = VAR(VAR_TIMER_NEXT);
- }
-
- if (!_colorCycle) // FIXME
- return;
for (i = 0, cycl = _colorCycle; i < 16; i++, cycl++) {
if (!cycl->delay || cycl->start > cycl->end)
Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -d -r1.83 -r1.84
--- scumm.cpp 10 Jul 2004 23:32:31 -0000 1.83
+++ scumm.cpp 11 Jul 2004 03:46:32 -0000 1.84
@@ -1652,7 +1652,8 @@
processActors();
_fullRedraw = false;
- cyclePalette();
+ if (_version >= 4 && _heversion <= 60)
+ cyclePalette();
palManipulate();
if (_doEffect) {
@@ -2134,7 +2135,8 @@
runExitScript();
killScriptsAndResources();
clearEnqueue();
- stopCycle(0);
+ if (_version >= 4 && _heversion <= 60)
+ stopCycle(0);
_sound->processSoundQues();
for (i = 1; i < _numActors; i++) {
More information about the Scummvm-git-logs
mailing list