aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorMax Horn2003-05-12 21:35:56 +0000
committerMax Horn2003-05-12 21:35:56 +0000
commitb2d7f502f6d2ce3564d2cf25b65bc98964866370 (patch)
tree676be49bcfa6cb6af84134b0124eb5f799518a80 /scumm
parent7848ce64ea3af438bb7254b5e4a768fa8fdf93e0 (diff)
downloadscummvm-rg350-b2d7f502f6d2ce3564d2cf25b65bc98964866370.tar.gz
scummvm-rg350-b2d7f502f6d2ce3564d2cf25b65bc98964866370.tar.bz2
scummvm-rg350-b2d7f502f6d2ce3564d2cf25b65bc98964866370.zip
made hasCharsetMask return a bool (fixes VC compilation warnings)
svn-id: r7478
Diffstat (limited to 'scumm')
-rw-r--r--scumm/gfx.cpp6
-rw-r--r--scumm/scumm.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/scumm/gfx.cpp b/scumm/gfx.cpp
index c03b498f8d..d9f8c374de 100644
--- a/scumm/gfx.cpp
+++ b/scumm/gfx.cpp
@@ -802,11 +802,11 @@ void Scumm::restoreBG(int left, int top, int right, int bottom, byte backColor)
}
}
-int Scumm::hasCharsetMask(int x, int y, int x2, int y2) {
+bool Scumm::hasCharsetMask(int x, int y, int x2, int y2) {
if (!_charset->_hasMask || y > gdi._mask_bottom || x > gdi._mask_right ||
y2 < gdi._mask_top || x2 < gdi._mask_left)
- return 0;
- return 1;
+ return false;
+ return true;
}
byte Scumm::isMaskActiveAt(int l, int t, int r, int b, byte *mem) {
diff --git a/scumm/scumm.h b/scumm/scumm.h
index 142c7b55a2..6cf7d75a63 100644
--- a/scumm/scumm.h
+++ b/scumm/scumm.h
@@ -1002,7 +1002,7 @@ public:
void initCharset(int charset);
void restoreCharsetBg();
- int hasCharsetMask(int x, int y, int x2, int y2);
+ bool hasCharsetMask(int x, int y, int x2, int y2);
void CHARSET_1();
void drawDescString(byte *msg);
byte *addMessageToStack(byte *msg);