From a1918e7e9d1585587be270183866797eb1c682f5 Mon Sep 17 00:00:00 2001 From: Haru Date: Thu, 6 Feb 2014 21:12:36 +0100 Subject: Corrected same-reference check to work on vars with the same name in different scopes - Fixes bugreport:8008, special thanks to KeyWorld http://hercules.ws/board/tracker/issue-8008-copyarray-fail-on-a-referenced-array-argument/ Signed-off-by: Haru --- src/map/script.h | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src/map/script.h') diff --git a/src/map/script.h b/src/map/script.h index ae851a7ec..ff947bf79 100644 --- a/src/map/script.h +++ b/src/map/script.h @@ -144,6 +144,13 @@ struct eri; /// Composes the uid of a reference from the id and the index #define reference_uid(id,idx) ( (int64) ((uint64)(id) & 0xFFFFFFFF) | ((uint64)(idx) << 32) ) +/// Checks whether two references point to the same variable (or array) +#define is_same_reference(data1, data2) \ + ( reference_getid(data1) == reference_getid(data2) \ + && ( (data1->ref == data2->ref && data1->ref == NULL) \ + || (data1->ref != NULL && data2->ref != NULL && data1->ref->vars == data2->ref->vars \ + ) ) ) + #define script_getvarid(var) ( (int32)(int64)(var & 0xFFFFFFFF) ) #define script_getvaridx(var) ( (uint32)(int64)((var >> 32) & 0xFFFFFFFF) ) -- cgit v1.2.3-60-g2f50