diff options
author | Juan Linietsky <juan@godotengine.org> | 2020-02-12 14:24:06 -0300 |
---|---|---|
committer | Juan Linietsky <juan@godotengine.org> | 2020-02-12 14:24:54 -0300 |
commit | cf8c679a23b21d6c6f29cba6a54eaa2eed88bf92 (patch) | |
tree | 52aca947b395362b2addec4843915b15947c32ca /servers/physics_server.h | |
parent | 4aa31a2851e3dd5b67193194f899850239b2669d (diff) |
ObjectID converted to a structure, fixes many bugs where used incorrectly as 32 bits.
Diffstat (limited to 'servers/physics_server.h')
-rw-r--r-- | servers/physics_server.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/servers/physics_server.h b/servers/physics_server.h index 6a66763b2f..f1388c8758 100644 --- a/servers/physics_server.h +++ b/servers/physics_server.h @@ -385,8 +385,8 @@ public: virtual void body_set_shape_disabled(RID p_body, int p_shape_idx, bool p_disabled) = 0; - virtual void body_attach_object_instance_id(RID p_body, uint32_t p_id) = 0; - virtual uint32_t body_get_object_instance_id(RID p_body) const = 0; + virtual void body_attach_object_instance_id(RID p_body, ObjectID p_id) = 0; + virtual ObjectID body_get_object_instance_id(RID p_body) const = 0; virtual void body_set_enable_continuous_collision_detection(RID p_body, bool p_enable) = 0; virtual bool body_is_continuous_collision_detection_enabled(RID p_body) const = 0; @@ -495,7 +495,7 @@ public: Variant collider_metadata; MotionResult() { collision_local_shape = 0; - collider_id = 0; + collider_id = ObjectID(); collider_shape = 0; } }; |