aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2003-05-12 21:53:36 +0000
committerMax Horn2003-05-12 21:53:36 +0000
commit47227fdf77f52dfb392dfd4fa26c3e76d8f6e523 (patch)
tree15511088cf044eaf4cb1356f93c1cc0091f4995c
parent0e226588f11d9a122b5ba09b5b577a3c46e735d3 (diff)
downloadscummvm-rg350-47227fdf77f52dfb392dfd4fa26c3e76d8f6e523.tar.gz
scummvm-rg350-47227fdf77f52dfb392dfd4fa26c3e76d8f6e523.tar.bz2
scummvm-rg350-47227fdf77f52dfb392dfd4fa26c3e76d8f6e523.zip
cleanup (fixes another VC warning, too ;-)
svn-id: r7480
-rw-r--r--scumm/gfx.cpp2
-rw-r--r--scumm/scumm.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/scumm/gfx.cpp b/scumm/gfx.cpp
index d9f8c374de..7ecf7c242f 100644
--- a/scumm/gfx.cpp
+++ b/scumm/gfx.cpp
@@ -809,7 +809,7 @@ bool Scumm::hasCharsetMask(int x, int y, int x2, int y2) {
return true;
}
-byte Scumm::isMaskActiveAt(int l, int t, int r, int b, byte *mem) {
+bool Scumm::isMaskActiveAt(int l, int t, int r, int b, byte *mem) {
int w, h, i;
l >>= 3;
diff --git a/scumm/scumm.h b/scumm/scumm.h
index 6cf7d75a63..aae968617e 100644
--- a/scumm/scumm.h
+++ b/scumm/scumm.h
@@ -846,7 +846,7 @@ public:
VirtScreen *findVirtScreen(int y);
void setVirtscreenDirty(VirtScreen *vs, int left, int top, int right, int bottom);
- byte isMaskActiveAt(int l, int t, int r, int b, byte *mem);
+ bool isMaskActiveAt(int l, int t, int r, int b, byte *mem);
void drawFlashlight();