aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilippos Karapetis2011-11-21 23:08:10 +0200
committerFilippos Karapetis2011-11-21 23:08:10 +0200
commite2bc38ea914d171c790c3853a9dcb26911c973c0 (patch)
treecce9515c688513b943004ec6e02bffbb8639898a
parent1eeb8529023157555f68cae0e3df9772d340d5ab (diff)
downloadscummvm-rg350-e2bc38ea914d171c790c3853a9dcb26911c973c0.tar.gz
scummvm-rg350-e2bc38ea914d171c790c3853a9dcb26911c973c0.tar.bz2
scummvm-rg350-e2bc38ea914d171c790c3853a9dcb26911c973c0.zip
TOLTECS: Change deltaValue to be an int8, as char isn't always signed
-rw-r--r--engines/toltecs/palette.cpp6
-rw-r--r--engines/toltecs/palette.h6
2 files changed, 6 insertions, 6 deletions
diff --git a/engines/toltecs/palette.cpp b/engines/toltecs/palette.cpp
index eb17725c8c..706218e0ba 100644
--- a/engines/toltecs/palette.cpp
+++ b/engines/toltecs/palette.cpp
@@ -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 *palPtr = palette + startIndex * 3;
@@ -138,7 +138,7 @@ void Palette::clearFragments() {
_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;
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
}
diff --git a/engines/toltecs/palette.h b/engines/toltecs/palette.h
index 140d59b431..7bcf06e027 100644
--- a/engines/toltecs/palette.h
+++ b/engines/toltecs/palette.h
@@ -41,7 +41,7 @@ public:
void setFullPalette(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 loadAddPaletteFrom(byte *source, byte startIndex, byte count);
@@ -50,8 +50,8 @@ public:
uint16 findFragment(int16 id);
void clearFragments();
- void buildColorTransTable(byte limit, char deltaValue, byte mask);
- void buildColorTransTable2(byte limit, char deltaValue, byte mask);
+ void buildColorTransTable(byte limit, int8 deltaValue, byte mask);
+ void buildColorTransTable2(byte limit, int8 deltaValue, byte mask);
byte getColorTransPixel(byte pixel) const { return _colorTransTable[pixel]; }
byte *getMainPalette() { return _mainPalette; }