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

1 files changed, 4 insertions, 4 deletions

diff --git a/modules/gdnavigation/rvo_agent.cpp b/modules/gdnavigation/rvo_agent.cpp
index eb66eb3a05..4d19bc15af 100644
--- a/modules/gdnavigation/rvo_agent.cpp
+++ b/modules/gdnavigation/rvo_agent.cpp
@@ -38,7 +38,7 @@
 
 RvoAgent::RvoAgent() :
 		map(NULL) {
-	callback.id = ObjectID(0);
+	callback.id = ObjectID();
 }
 
 void RvoAgent::set_map(NavMap *p_map) {
@@ -62,16 +62,16 @@ void RvoAgent::set_callback(ObjectID p_id, const StringName p_method, const Vari
 }
 
 bool RvoAgent::has_callback() const {
-	return callback.id != 0;
+	return callback.id.is_valid();
 }
 
 void RvoAgent::dispatch_callback() {
-	if (callback.id == 0) {
+	if (callback.id.is_null()) {
 		return;
 	}
 	Object *obj = ObjectDB::get_instance(callback.id);
 	if (obj == NULL) {
-		callback.id = ObjectID(0);
+		callback.id = ObjectID();
 	}
 
 	Variant::CallError responseCallError;