aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/graphics/palette.cpp
diff options
context:
space:
mode:
authorFilippos Karapetis2016-01-08 11:09:29 +0200
committerFilippos Karapetis2016-01-08 11:09:29 +0200
commita119108835c9539acf5f7e6da5e483c59e637ee5 (patch)
treecf3ae7e2cef3fab031a4c6fb89bf548243b60951 /engines/sci/graphics/palette.cpp
parent7379e531c75294577b4859fceb73ae01559dae0f (diff)
downloadscummvm-rg350-a119108835c9539acf5f7e6da5e483c59e637ee5.tar.gz
scummvm-rg350-a119108835c9539acf5f7e6da5e483c59e637ee5.tar.bz2
scummvm-rg350-a119108835c9539acf5f7e6da5e483c59e637ee5.zip
SCI: Fix compilation
Diffstat (limited to 'engines/sci/graphics/palette.cpp')
-rw-r--r--engines/sci/graphics/palette.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/sci/graphics/palette.cpp b/engines/sci/graphics/palette.cpp
index 667aef4f28..3742a8d2d8 100644
--- a/engines/sci/graphics/palette.cpp
+++ b/engines/sci/graphics/palette.cpp
@@ -977,7 +977,7 @@ void GfxPalette::palVaryProcess(int signal, bool setPalette) {
_palVaryResourceId = -1;
// Calculate inbetween palette
- Sci::Color inbetween;
+ Color inbetween;
int16 color;
for (int colorNr = 1; colorNr < 255; colorNr++) {
inbetween.used = _sysPalette.colors[colorNr].used;
@@ -988,7 +988,7 @@ void GfxPalette::palVaryProcess(int signal, bool setPalette) {
color = _palVaryTargetPalette.colors[colorNr].b - _palVaryOriginPalette.colors[colorNr].b;
inbetween.b = ((color * _palVaryStep) / 64) + _palVaryOriginPalette.colors[colorNr].b;
- if (memcmp(&inbetween, &_sysPalette.colors[colorNr], sizeof(Sci::Color))) {
+ if (memcmp(&inbetween, &_sysPalette.colors[colorNr], sizeof(Color))) {
_sysPalette.colors[colorNr] = inbetween;
_sysPaletteChanged = true;
}