[Scummvm-cvs-logs] scummvm master -> e882e327b29f4284433fec41e45f57acec3ce72b

[dreammaster]

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:
e882e327b2 SHERLOCK: Fix enum compiler warnings


Commit: e882e327b29f4284433fec41e45f57acec3ce72b
    https://github.com/scummvm/scummvm/commit/e882e327b29f4284433fec41e45f57acec3ce72b
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-06-27T07:36:25-04:00

Commit Message:
SHERLOCK: Fix enum compiler warnings

Changed paths:
    engines/sherlock/sherlock.h



diff --git a/engines/sherlock/sherlock.h b/engines/sherlock/sherlock.h
index 5e6cf03..b0d0fa2 100644
--- a/engines/sherlock/sherlock.h
+++ b/engines/sherlock/sherlock.h
@@ -68,8 +68,8 @@ enum GameType {
 #define SHERLOCK_SCENE_HEIGHT (IS_SERRATED_SCALPEL ? 138 : 480)
 #define SCENES_COUNT (IS_SERRATED_SCALPEL ? 63 : 101)
 
-#define COL_INFO_FOREGROUND (IS_SERRATED_SCALPEL ? Scalpel::INFO_FOREGROUND : Tattoo::INFO_FOREGROUND)
-#define COL_PEN_COLOR (IS_SERRATED_SCALPEL ? Scalpel::PEN_COLOR : Tattoo::PEN_COLOR)
+#define COL_INFO_FOREGROUND (IS_SERRATED_SCALPEL ? (byte)Scalpel::INFO_FOREGROUND : (byte)Tattoo::INFO_FOREGROUND)
+#define COL_PEN_COLOR (IS_SERRATED_SCALPEL ? (byte)Scalpel::PEN_COLOR : (byte)Tattoo::PEN_COLOR)
 
 struct SherlockGameDescription;