aboutsummaryrefslogtreecommitdiff
path: root/scumm/smush/color.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'scumm/smush/color.cpp')
-rw-r--r--scumm/smush/color.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/scumm/smush/color.cpp b/scumm/smush/color.cpp
index 54a06df3e1..f56dafed5f 100644
--- a/scumm/smush/color.cpp
+++ b/scumm/smush/color.cpp
@@ -22,12 +22,12 @@
#include <stdafx.h>
#include "color.h"
-#define UPDATE_COLOR(c, inc) (((int)((c)) << 7) + (c) + (inc)) >> 7
+#define UPDATE_COLOR(c, inc) (((int32)((c)) << 7) + (c) + (inc)) >> 7
#define CHECK_BOUNDS(c) (((c) > 255) ? 255 : (((c) < 0) ? 0 : (c)))
-void Color::delta(short * ptr) {
+void Color::delta(int16 * ptr) {
// This is a very specific method for XPALs.
- int t;
+ int16 t;
t = UPDATE_COLOR(_r, ptr[0]);
_r = CHECK_BOUNDS(t);
t = UPDATE_COLOR(_g, ptr[1]);