ObjectID converted to a structure, fixes many bugs where used incorrectly as 32 bits.

1 files changed, 4 insertions, 5 deletions

diff --git a/core/func_ref.cpp b/core/func_ref.cpp
index 2dffb30bab..e20188c813 100644
--- a/core/func_ref.cpp
+++ b/core/func_ref.cpp
@@ -32,7 +32,7 @@
 
 Variant FuncRef::call_func(const Variant **p_args, int p_argcount, Variant::CallError &r_error) {
 
-	if (id == 0) {
+	if (id.is_null()) {
 		r_error.error = Variant::CallError::CALL_ERROR_INSTANCE_IS_NULL;
 		return Variant();
 	}
@@ -48,7 +48,7 @@ Variant FuncRef::call_func(const Variant **p_args, int p_argcount, Variant::Call
 
 Variant FuncRef::call_funcv(const Array &p_args) {
 
-	ERR_FAIL_COND_V(id == 0, Variant());
+	ERR_FAIL_COND_V(id.is_null(), Variant());
 
 	Object *obj = ObjectDB::get_instance(id);
 
@@ -69,7 +69,7 @@ void FuncRef::set_function(const StringName &p_func) {
 }
 
 bool FuncRef::is_valid() const {
-	if (id == 0)
+	if (id.is_null())
 		return false;
 
 	Object *obj = ObjectDB::get_instance(id);
@@ -95,6 +95,5 @@ void FuncRef::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("is_valid"), &FuncRef::is_valid);
 }
 
-FuncRef::FuncRef() :
-		id(0) {
+FuncRef::FuncRef() {
 }