Fixed crash when removing objects and removed useless includes.

Author: AndreaCatania

core/net_utilities.cpp

@@ -242,15 +242,15 @@ void NS::SyncGroup::remove_all_nodes() {
 void NS::SyncGroup::notify_new_variable(ObjectData *p_object_data, const std::string &p_var_name) {
 	int index = simulated_sync_objects.find(p_object_data);
 	if (index >= 0) {
-		simulated_sync_objects[index].change.vars.insert(p_var_name);
-		simulated_sync_objects[index].change.uknown_vars.insert(p_var_name);
+		VecFunc::insert_unique(simulated_sync_objects[index].change.vars, p_var_name);
+		VecFunc::insert_unique(simulated_sync_objects[index].change.uknown_vars, p_var_name);
 	}
 }
 
 void NS::SyncGroup::notify_variable_changed(ObjectData *p_object_data, const std::string &p_var_name) {
 	int index = simulated_sync_objects.find(p_object_data);
 	if (index >= 0) {
-		simulated_sync_objects[index].change.vars.insert(p_var_name);
+		VecFunc::insert_unique(simulated_sync_objects[index].change.vars, p_var_name);
 	}
 }
 

core/net_utilities.h

@@ -1,11 +1,11 @@
 #pragma once
 
-#include "core/config/project_settings.h"
 #include "core/templates/local_vector.h"
 
 #include "core.h"
 #include "processor.h"
 #include "var_data.h"
+#include <math.h>
 #include <chrono>
 #include <map>
 #include <string>
@@ -361,7 +361,7 @@ T StatisticalRingBuffer<T>::average() const {
 	a = a / T(data.size());
 	T b = avg_sum / T(data.size());
 	const T difference = a > b ? a - b : b - a;
-	ERR_FAIL_COND_V_MSG(difference > (CMP_EPSILON * 4.0), b, "The `avg_sum` accumulated a sensible precision loss: " + rtos(difference));
+	ERR_FAIL_COND_V_MSG(difference > (std::numeric_limits<T>::epsilon() * 4.0), b, "The `avg_sum` accumulated a sensible precision loss: " + rtos(difference));
 	return b;
 #else
 	// Divide it by the buffer size is wrong when the buffer is not yet fully
@@ -381,10 +381,10 @@ T StatisticalRingBuffer<T>::average_rounded() const {
 	for (uint32_t i = 1; i < data.size(); i += 1) {
 		a += data[i];
 	}
-	a = Math::round(double(a) / double(data.size()));
-	T b = Math::round(double(avg_sum) / double(data.size()));
+	a = round(double(a) / double(data.size()));
+	T b = round(double(avg_sum) / double(data.size()));
 	const T difference = a > b ? a - b : b - a;
-	ERR_FAIL_COND_V_MSG(difference > (CMP_EPSILON * 4.0), b, "The `avg_sum` accumulated a sensible precision loss: " + rtos(difference));
+	ERR_FAIL_COND_V_MSG(difference > (std::numeric_limits<T>::epsilon() * 4.0), b, "The `avg_sum` accumulated a sensible precision loss: " + rtos(difference));
 	return b;
 #else
 	// Divide it by the buffer size is wrong when the buffer is not yet fully
@@ -403,10 +403,10 @@ T StatisticalRingBuffer<T>::get_deviation(T p_mean) const {
 
 	double r = 0;
 	for (uint32_t i = 0; i < data.size(); i += 1) {
-		r += Math::pow(double(data[i]) - double(p_mean), 2.0);
+		r += pow(double(data[i]) - double(p_mean), 2.0);
 	}
 
-	return Math::sqrt(r / double(data.size()));
+	return sqrt(r / double(data.size()));
 }
 
 template <class T>
@@ -474,8 +474,8 @@ struct SyncGroup {
 public:
 	struct Change {
 		bool unknown = false;
-		RBSet<std::string> uknown_vars;
-		RBSet<std::string> vars;
+		std::vector<std::string> uknown_vars;
+		std::vector<std::string> vars;
 	};
 
 	struct SimulatedObjectInfo {

core/peer_networked_controller.cpp

@@ -1,5 +1,6 @@
 #include "peer_networked_controller.h"
 
+#include "core/config/project_settings.h"
 #include "core/io/marshalls.h"
 #include "core/os/os.h"
 #include "core/templates/vector.h"

godot4/gd_scene_synchronizer.cpp

@@ -1,5 +1,6 @@
 #include "gd_scene_synchronizer.h"
 
+#include "core/config/project_settings.h"
 #include "core/object/object.h"
 #include "core/string/string_name.h"
 #include "core/string/ustring.h"