diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-06-26 12:09:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-26 12:09:20 +0200 |
| commit | 773b66dfd3b68ae0c3fbb1fbdd8b326efb8dc3e6 (patch) | |
| tree | dcd786899cb032f5074560e619c233fd32c53fa2 /core | |
| parent | eeee1dc73e6344a5541ee323b6ae61744b3348b6 (diff) | |
| parent | a9cff880d6ace9a18859822e535c79041a070a49 (diff) | |
Merge pull request #30084 from akien-mga/doc-encodedobjectasid
doc: Document EncodedObjectAsID, expose its property
Diffstat (limited to 'core')
| -rw-r--r-- | core/io/marshalls.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/core/io/marshalls.cpp b/core/io/marshalls.cpp index 7494603462..3c9c5bc2bb 100644 --- a/core/io/marshalls.cpp +++ b/core/io/marshalls.cpp @@ -37,13 +37,11 @@ #include <limits.h> #include <stdio.h> -#define _S(a) ((int32_t)a) -#define ERR_FAIL_ADD_OF(a, b, err) ERR_FAIL_COND_V(_S(b) < 0 || _S(a) < 0 || _S(a) > INT_MAX - _S(b), err) -#define ERR_FAIL_MUL_OF(a, b, err) ERR_FAIL_COND_V(_S(a) < 0 || _S(b) <= 0 || _S(a) > INT_MAX / _S(b), err) - void EncodedObjectAsID::_bind_methods() { ClassDB::bind_method(D_METHOD("set_object_id", "id"), &EncodedObjectAsID::set_object_id); ClassDB::bind_method(D_METHOD("get_object_id"), &EncodedObjectAsID::get_object_id); + + ADD_PROPERTY(PropertyInfo(Variant::INT, "object_id"), "set_object_id", "get_object_id"); } void EncodedObjectAsID::set_object_id(ObjectID p_id) { @@ -59,6 +57,10 @@ EncodedObjectAsID::EncodedObjectAsID() : id(0) { } +#define _S(a) ((int32_t)a) +#define ERR_FAIL_ADD_OF(a, b, err) ERR_FAIL_COND_V(_S(b) < 0 || _S(a) < 0 || _S(a) > INT_MAX - _S(b), err) +#define ERR_FAIL_MUL_OF(a, b, err) ERR_FAIL_COND_V(_S(a) < 0 || _S(b) <= 0 || _S(a) > INT_MAX / _S(b), err) + #define ENCODE_MASK 0xFF #define ENCODE_FLAG_64 1 << 16 #define ENCODE_FLAG_OBJECT_AS_ID 1 << 16 |