[Scummvm-git-logs] scummvm master -> 62b3c00da3b95fe4e25aa5b937ea56e1ff0072dc

[wjp]

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:
62b3c00da3 SCI: Add missing parentheses to SIG/PATCH macros


Commit: 62b3c00da3b95fe4e25aa5b937ea56e1ff0072dc
    https://github.com/scummvm/scummvm/commit/62b3c00da3b95fe4e25aa5b937ea56e1ff0072dc
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2016-08-30T19:49:03+02:00

Commit Message:
SCI: Add missing parentheses to SIG/PATCH macros

Changed paths:
    engines/sci/engine/script_patches.h



diff --git a/engines/sci/engine/script_patches.h b/engines/sci/engine/script_patches.h
index 645e094..f95806a 100644
--- a/engines/sci/engine/script_patches.h
+++ b/engines/sci/engine/script_patches.h
@@ -35,13 +35,13 @@ namespace Sci {
 #define SIG_BYTEMASK                 0x00FF
 #define SIG_MAGICDWORD               0xF000
 #define SIG_CODE_ADDTOOFFSET         0xE000
-#define SIG_ADDTOOFFSET(_offset_)    SIG_CODE_ADDTOOFFSET | _offset_
+#define SIG_ADDTOOFFSET(_offset_)    SIG_CODE_ADDTOOFFSET | (_offset_)
 #define SIG_CODE_SELECTOR16          0x9000
 #define SIG_SELECTOR16(_selectorID_) SIG_CODE_SELECTOR16 | SELECTOR_##_selectorID_
 #define SIG_CODE_SELECTOR8           0x8000
 #define SIG_SELECTOR8(_selectorID_)  SIG_CODE_SELECTOR8 | SELECTOR_##_selectorID_
 #define SIG_CODE_UINT16              0x1000
-#define SIG_UINT16(_value_)          SIG_CODE_UINT16 | (_value_ & 0xFF), (_value_ >> 8)
+#define SIG_UINT16(_value_)          SIG_CODE_UINT16 | ((_value_) & 0xFF), ((_value_) >> 8)
 #define SIG_CODE_BYTE                0x0000
 
 #define PATCH_END                                            SIG_END
@@ -49,17 +49,17 @@ namespace Sci {
 #define PATCH_VALUEMASK                                      SIG_VALUEMASK
 #define PATCH_BYTEMASK                                       SIG_BYTEMASK
 #define PATCH_CODE_ADDTOOFFSET                               SIG_CODE_ADDTOOFFSET
-#define PATCH_ADDTOOFFSET(_offset_)                          SIG_CODE_ADDTOOFFSET | _offset_
+#define PATCH_ADDTOOFFSET(_offset_)                          SIG_CODE_ADDTOOFFSET | (_offset_)
 #define PATCH_CODE_GETORIGINALBYTE                           0xD000
-#define PATCH_GETORIGINALBYTE(_offset_)                      PATCH_CODE_GETORIGINALBYTE | _offset_
+#define PATCH_GETORIGINALBYTE(_offset_)                      PATCH_CODE_GETORIGINALBYTE | (_offset_)
 #define PATCH_CODE_GETORIGINALBYTEADJUST                     0xC000
-#define PATCH_GETORIGINALBYTEADJUST(_offset_, _adjustValue_) PATCH_CODE_GETORIGINALBYTEADJUST | _offset_, (uint16)(_adjustValue_)
+#define PATCH_GETORIGINALBYTEADJUST(_offset_, _adjustValue_) PATCH_CODE_GETORIGINALBYTEADJUST | (_offset_), (uint16)(_adjustValue_)
 #define PATCH_CODE_SELECTOR16                                SIG_CODE_SELECTOR16
 #define PATCH_SELECTOR16(_selectorID_)                       SIG_CODE_SELECTOR16 | SELECTOR_##_selectorID_
 #define PATCH_CODE_SELECTOR8                                 SIG_CODE_SELECTOR8
 #define PATCH_SELECTOR8(_selectorID_)                        SIG_CODE_SELECTOR8 | SELECTOR_##_selectorID_
 #define PATCH_CODE_UINT16                                    SIG_CODE_UINT16
-#define PATCH_UINT16(_value_)                                SIG_CODE_UINT16 | (_value_ & 0xFF), (_value_ >> 8)
+#define PATCH_UINT16(_value_)                                SIG_CODE_UINT16 | ((_value_) & 0xFF), ((_value_) >> 8)
 #define PATCH_CODE_BYTE                                      SIG_CODE_BYTE
 
 // defines maximum scratch area for getting original bytes from unpatched script data