From d6dafa822ae82a1a9d7aa7eb19327b2a414cd6af Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Fri, 20 Dec 2013 16:05:36 +0100
Subject: SCI: final script patcher cleanup

---
 engines/sci/engine/script_patches.h | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

(limited to 'engines/sci/engine/script_patches.h')

diff --git a/engines/sci/engine/script_patches.h b/engines/sci/engine/script_patches.h
index 563d00a26b..9e572f33fa 100644
--- a/engines/sci/engine/script_patches.h
+++ b/engines/sci/engine/script_patches.h
@@ -44,21 +44,23 @@ namespace Sci {
 #define SIG_UINT16(_value_)          SIG_CODE_UINT16 | (_value_ & 0xFF), (_value_ >> 8)
 #define SIG_CODE_BYTE                0x0000
 
-#define PATCH_END                      SIG_END
-#define PATCH_COMMANDMASK              SIG_COMMANDMASK
-#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_GETORIGINALBYTE          0xD000
-#define PATCH_GETORIGINALBYTEADJUST    0xC000
-#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_CODE_BYTE                SIG_CODE_BYTE
+#define PATCH_END                                            SIG_END
+#define PATCH_COMMANDMASK                                    SIG_COMMANDMASK
+#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_CODE_GETORIGINALBYTE                           0xD000
+#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_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_CODE_BYTE                                      SIG_CODE_BYTE
 
 // defines maximum scratch area for getting original bytes from unpatched script data
 #define PATCH_VALUELIMIT      4096
-- 
cgit v1.2.3