[Scummvm-cvs-logs] scummvm master -> 82be9326f792e95c679cd0394a98efd8c2532a35

[csnover]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
82be9326f7 SCI32: Actually use the BitmapFlags enum


Commit: 82be9326f792e95c679cd0394a98efd8c2532a35
    https://github.com/scummvm/scummvm/commit/82be9326f792e95c679cd0394a98efd8c2532a35
Author: Colin Snover (github.com at zetafleet.com)
Date: 2016-03-07T22:57:46-06:00

Commit Message:
SCI32: Actually use the BitmapFlags enum

Changed paths:
    engines/sci/graphics/text32.h



diff --git a/engines/sci/graphics/text32.h b/engines/sci/graphics/text32.h
index f44035a..472d5e0 100644
--- a/engines/sci/graphics/text32.h
+++ b/engines/sci/graphics/text32.h
@@ -154,15 +154,15 @@ public:
 	}
 
 	inline bool getRemap() const {
-		return READ_SCI11ENDIAN_UINT16(_bitmap + 10) & 2;
+		return READ_SCI11ENDIAN_UINT16(_bitmap + 10) & kBitmapRemap;
 	}
 
 	inline void setRemap(const bool remap) {
 		uint16 flags = READ_SCI11ENDIAN_UINT16(_bitmap + 10);
 		if (remap) {
-			flags |= 2;
+			flags |= kBitmapRemap;
 		} else {
-			flags &= ~2;
+			flags &= ~kBitmapRemap;
 		}
 		WRITE_SCI11ENDIAN_UINT16(_bitmap + 10, flags);
 	}