isledecomp/isle-portable
1
0
Fork 0
mirror of https://github.com/isledecomp/isle-portable.git synced 2026-05-15 08:16:34 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Add configurable room name, fix parameter naming in multiplayer extension

Browse Source 
Read "multiplayer:room" from INI options (default "default") and use it
in Connect() instead of a hardcoded string. Return early if room is blank,
matching the relay URL check. Rename p_mgr to p_networkManager for consistency.
This commit is contained in:
Christian Semmler 2026-03-01 10:35:16 -08:00
parent dac40932a6
commit 762a5f3941
No known key found for this signature in database
GPG Key ID: 086DAA1360BEEE5C
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ISLE/emscripten/config.cpp
View File

@ -21,6 +21,7 @@ void Emscripten_SetupDefaultConfigOverrides(dictionary* p_dictionary)
iniparser_set(p_dictionary, "extensions:multiplayer", "true"); iniparser_set(p_dictionary, "extensions:multiplayer", "true");
iniparser_set(p_dictionary, "multiplayer", NULL); iniparser_set(p_dictionary, "multiplayer", NULL);
iniparser_set(p_dictionary, "multiplayer:relay url", "ws://localhost:8787"); iniparser_set(p_dictionary, "multiplayer:relay url", "ws://localhost:8787");
iniparser_set(p_dictionary, "multiplayer:room", "default");
// Emscripten-only for now // Emscripten-only for now
Emscripten_SetScaleAspect(iniparser_getboolean(p_dictionary, "isle:Original Aspect Ratio", true)); Emscripten_SetScaleAspect(iniparser_getboolean(p_dictionary, "isle:Original Aspect Ratio", true));

3
extensions/include/extensions/multiplayer.h
View File

@ -31,8 +31,9 @@ class MultiplayerExt {
static bool enabled; static bool enabled;
static std::string relayUrl; static std::string relayUrl;
static std::string room;
static void SetNetworkManager(Multiplayer::NetworkManager* p_mgr); static void SetNetworkManager(Multiplayer::NetworkManager* p_networkManager);
static Multiplayer::NetworkManager* GetNetworkManager(); static Multiplayer::NetworkManager* GetNetworkManager();
private: private:

10
extensions/src/multiplayer.cpp
View File

@ -16,14 +16,16 @@ using namespace Extensions;
std::map<std::string, std::string> MultiplayerExt::options; std::map<std::string, std::string> MultiplayerExt::options;
bool MultiplayerExt::enabled = false; bool MultiplayerExt::enabled = false;
std::string MultiplayerExt::relayUrl; std::string MultiplayerExt::relayUrl;
std::string MultiplayerExt::room;
Multiplayer::NetworkManager* MultiplayerExt::s_networkManager = nullptr; Multiplayer::NetworkManager* MultiplayerExt::s_networkManager = nullptr;
Multiplayer::NetworkTransport* MultiplayerExt::s_transport = nullptr; Multiplayer::NetworkTransport* MultiplayerExt::s_transport = nullptr;
void MultiplayerExt::Initialize() void MultiplayerExt::Initialize()
{ {
relayUrl = options["multiplayer:relay url"]; relayUrl = options["multiplayer:relay url"];
room = options["multiplayer:room"];
if (relayUrl.empty()) { if (relayUrl.empty() || room.empty()) {
return; return;
} }
@ -33,7 +35,7 @@ void MultiplayerExt::Initialize()
s_networkManager = new Multiplayer::NetworkManager(); s_networkManager = new Multiplayer::NetworkManager();
s_networkManager->Initialize(s_transport); s_networkManager->Initialize(s_transport);
s_networkManager->Connect("default"); s_networkManager->Connect(room.c_str());
#endif #endif
} }
@ -98,9 +100,9 @@ MxBool MultiplayerExt::HandleEntityNotify(LegoEntity* p_entity)
return s_networkManager->HandleEntityMutation(p_entity, changeType); return s_networkManager->HandleEntityMutation(p_entity, changeType);
} }
void MultiplayerExt::SetNetworkManager(Multiplayer::NetworkManager* p_mgr) void MultiplayerExt::SetNetworkManager(Multiplayer::NetworkManager* p_networkManager)
{ {
s_networkManager = p_mgr; s_networkManager = p_networkManager;
} }
Multiplayer::NetworkManager* MultiplayerExt::GetNetworkManager() Multiplayer::NetworkManager* MultiplayerExt::GetNetworkManager()