Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Some small changes before new release #763

Merged
merged 3 commits into from
Nov 10, 2023
Merged

Some small changes before new release #763

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5a40879
change server version to omp A.B.C.D, show allowed clients
AmyrAhmady Nov 9, 2023
a1bd623
restream individual pickup when vw is changed
AmyrAhmady Nov 9, 2023
ac5b521
bump omp version to 1.1.0.x
AmyrAhmady Nov 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)

Expand Down
14 changes: 8 additions & 6 deletions Server/Components/LegacyNetwork/legacy_network_impl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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();
Expand Down
1 change: 1 addition & 0 deletions Server/Components/Pickups/pickup.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down