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

TOLTECS: Change deltaValue to be an int8, as char isn't always signed

Browse source
This commit is contained in:
Filippos Karapetis 2011-11-21 23:08:10 +02:00
parent 1eeb852902
commit e2bc38ea91
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
engines/toltecs/palette.cpp
View file

@ -59,7 +59,7 @@ void Palette::getFullPalette(byte *palette) {
} }
} }
void Palette::setDeltaPalette(byte *palette, byte mask, char deltaValue, int16 count, int16 startIndex) { void Palette::setDeltaPalette(byte *palette, byte mask, int8 deltaValue, int16 count, int16 startIndex) {
byte colors[768]; byte colors[768];
byte *palPtr = palette + startIndex * 3; byte *palPtr = palette + startIndex * 3;
@ -138,7 +138,7 @@ void Palette::clearFragments() {
_fragments.clear(); _fragments.clear();
} }
void Palette::buildColorTransTable(byte limit, char deltaValue, byte mask) { void Palette::buildColorTransTable(byte limit, int8 deltaValue, byte mask) {
byte r = 0, g = 0, b = 0; byte r = 0, g = 0, b = 0;
mask &= 7; mask &= 7;
@ -180,7 +180,7 @@ void Palette::buildColorTransTable(byte limit, char deltaValue, byte mask) {
} }
} }
void Palette::buildColorTransTable2(byte limit, char deltaValue, byte mask) { void Palette::buildColorTransTable2(byte limit, int8 deltaValue, byte mask) {
// TODO // TODO
} }

6
engines/toltecs/palette.h
View file

@ -41,7 +41,7 @@ public:
void setFullPalette(byte *palette); void setFullPalette(byte *palette);
void getFullPalette(byte *palette); void getFullPalette(byte *palette);
void setDeltaPalette(byte *palette, byte mask, char deltaValue, int16 count, int16 startIndex); void setDeltaPalette(byte *palette, byte mask, int8 deltaValue, int16 count, int16 startIndex);
void loadAddPalette(uint resIndex, byte startIndex); void loadAddPalette(uint resIndex, byte startIndex);
void loadAddPaletteFrom(byte *source, byte startIndex, byte count); void loadAddPaletteFrom(byte *source, byte startIndex, byte count);
@ -50,8 +50,8 @@ public:
uint16 findFragment(int16 id); uint16 findFragment(int16 id);
void clearFragments(); void clearFragments();
void buildColorTransTable(byte limit, char deltaValue, byte mask); void buildColorTransTable(byte limit, int8 deltaValue, byte mask);
void buildColorTransTable2(byte limit, char deltaValue, byte mask); void buildColorTransTable2(byte limit, int8 deltaValue, byte mask);
byte getColorTransPixel(byte pixel) const { return _colorTransTable[pixel]; } byte getColorTransPixel(byte pixel) const { return _colorTransTable[pixel]; }
byte *getMainPalette() { return _mainPalette; } byte *getMainPalette() { return _mainPalette; }