Merge pull request #763 from openmultiplayer/amir/new_changes

Some small changes before new release
openmultiplayer · Nov 10, 2023 · 8829f9f · 8829f9f
2 parents 3eb568c + ac5b521
commit 8829f9f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.19)
-project(open-mp LANGUAGES C CXX VERSION 1.0.1)
+project(open-mp LANGUAGES C CXX VERSION 1.1.0)
 
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 

diff --git a/Server/Components/LegacyNetwork/legacy_network_impl.cpp b/Server/Components/LegacyNetwork/legacy_network_impl.cpp
@@ -9,6 +9,7 @@
 #include "legacy_network_impl.hpp"
 #include "Query/query.hpp"
 #include "raknet/../../SAMPRakNet.hpp"
+#include <sstream>
 #include <netcode.hpp>
 #include <raknet/PacketEnumerations.h>
 #include <raknet/RakPeer.h>
@@ -790,13 +791,14 @@ void RakNetLegacyNetwork::start()
 	bool allow037 = *config.getBool("network.allow_037_clients");
 
 	query.setCore(core);
-	query.setRuleValue<false>("version", !allow037 ? "0.3.DL-R1" : "0.3.7-R2");
-	query.setRuleValue<false>("artwork", artwork ? "Yes" : "No");
 
-	if (allow037)
-	{
-		query.setRuleValue<false>("allow_DL", "Yes");
-	}
+	std::stringstream version;
+	version << "omp " << OMP_VERSION_MAJOR << "." << OMP_VERSION_MINOR << "." << OMP_VERSION_PATCH << "." << BUILD_NUMBER;
+	query.setRuleValue<false>("version", version.str());
+	// Send as a rule to announce which clients are allowed to join
+	query.setRuleValue<false>("allowed_clients", !allow037 ? "0.3.DL" : "0.3.7, 0.3.DL");
+
+	query.setRuleValue<false>("artwork", artwork ? "Yes" : "No");
 
 	query.setMaxPlayers(maxPlayers);
 	query.buildPlayerDependentBuffers();

diff --git a/Server/Components/Pickups/pickup.hpp b/Server/Components/Pickups/pickup.hpp
@@ -156,6 +156,7 @@ class Pickup final : public IPickup, public PoolIDProvider, public NoCopy
 	void setVirtualWorld(int vw) override
 	{
 		virtualWorld = vw;
+		restream();
 	}
 
 	int getID() const override