1 files changed, 20 insertions, 23 deletions

diff --git a/modules/navigation/godot_navigation_server.cpp b/modules/navigation/godot_navigation_server.cpp
index 9b5d78d465..5baf6db2e8 100644
--- a/modules/navigation/godot_navigation_server.cpp
+++ b/modules/navigation/godot_navigation_server.cpp
@@ -535,32 +535,32 @@ uint32_t GodotNavigationServer::link_get_navigation_layers(const RID p_link) con
 	return link->get_navigation_layers();
 }
 
-COMMAND_2(link_set_start_location, RID, p_link, Vector3, p_location) {
+COMMAND_2(link_set_start_position, RID, p_link, Vector3, p_position) {
 	NavLink *link = link_owner.get_or_null(p_link);
 	ERR_FAIL_COND(link == nullptr);
 
-	link->set_start_location(p_location);
+	link->set_start_position(p_position);
 }
 
-Vector3 GodotNavigationServer::link_get_start_location(RID p_link) const {
+Vector3 GodotNavigationServer::link_get_start_position(RID p_link) const {
 	const NavLink *link = link_owner.get_or_null(p_link);
 	ERR_FAIL_COND_V(link == nullptr, Vector3());
 
-	return link->get_start_location();
+	return link->get_start_position();
 }
 
-COMMAND_2(link_set_end_location, RID, p_link, Vector3, p_location) {
+COMMAND_2(link_set_end_position, RID, p_link, Vector3, p_position) {
 	NavLink *link = link_owner.get_or_null(p_link);
 	ERR_FAIL_COND(link == nullptr);
 
-	link->set_end_location(p_location);
+	link->set_end_position(p_position);
 }
 
-Vector3 GodotNavigationServer::link_get_end_location(RID p_link) const {
+Vector3 GodotNavigationServer::link_get_end_position(RID p_link) const {
 	const NavLink *link = link_owner.get_or_null(p_link);
 	ERR_FAIL_COND_V(link == nullptr, Vector3());
 
-	return link->get_end_location();
+	return link->get_end_position();
 }
 
 COMMAND_2(link_set_enter_cost, RID, p_link, real_t, p_enter_cost) {
@@ -731,24 +731,21 @@ COMMAND_1(free, RID, p_object) {
 		NavMap *map = map_owner.get_or_null(p_object);
 
 		// Removes any assigned region
-		LocalVector<NavRegion *> regions = map->get_regions();
-		for (uint32_t i = 0; i < regions.size(); i++) {
-			map->remove_region(regions[i]);
-			regions[i]->set_map(nullptr);
+		for (NavRegion *region : map->get_regions()) {
+			map->remove_region(region);
+			region->set_map(nullptr);
 		}
 
 		// Removes any assigned links
-		LocalVector<NavLink *> links = map->get_links();
-		for (uint32_t i = 0; i < links.size(); i++) {
-			map->remove_link(links[i]);
-			links[i]->set_map(nullptr);
+		for (NavLink *link : map->get_links()) {
+			map->remove_link(link);
+			link->set_map(nullptr);
 		}
 
 		// Remove any assigned agent
-		LocalVector<RvoAgent *> agents = map->get_agents();
-		for (uint32_t i = 0; i < agents.size(); i++) {
-			map->remove_agent(agents[i]);
-			agents[i]->set_map(nullptr);
+		for (RvoAgent *agent : map->get_agents()) {
+			map->remove_agent(agent);
+			agent->set_map(nullptr);
 		}
 
 		int map_index = active_maps.find(map);
@@ -806,9 +803,9 @@ void GodotNavigationServer::flush_queries() {
 	MutexLock lock(commands_mutex);
 	MutexLock lock2(operations_mutex);
 
-	for (size_t i(0); i < commands.size(); i++) {
-		commands[i]->exec(this);
-		memdelete(commands[i]);
+	for (SetCommand *command : commands) {
+		command->exec(this);
+		memdelete(command);
 	}
 	commands.clear();
 }