From 18d33933d482611dc8b010591fc2a704c89a79da Mon Sep 17 00:00:00 2001 From: Stefan Heinz <31664665+StefanH-AT@users.noreply.github.com> Date: Sun, 5 Dec 2021 21:26:58 +0100 Subject: [PATCH 1/3] Add note to readme about cmake version to build --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 28b7ea3b..47d81354 100644 --- a/README.md +++ b/README.md @@ -45,6 +45,8 @@ If you're using a DLU client, then you don't need to change anything. But if you ### Linux builds Make sure packages like `gcc`, `cmake`, and `zlib` are installed. Depending on the distribution, these packages might already be installed. +cmake must be version 3.12 or higher! + **Build the repository** ```bash # Create the build directory, preserving it if it already exists From 7dadc4ce771a4d699784d2d0402b4a624ae90700 Mon Sep 17 00:00:00 2001 From: TheLongestRose Date: Mon, 6 Dec 2021 00:04:52 -0800 Subject: [PATCH 2/3] Important note for WSL2 users The server and client cannot connect when the server is running on a WSL2 distro and the server is set to localhost, due to differences between WSL1 and 2. This won't affect most people, but would have saved me a few hours. --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index ad114f5d..8e95ea05 100644 --- a/README.md +++ b/README.md @@ -223,6 +223,7 @@ To connect to a server follow these steps: * Open it in a text editor and locate where it says `AUTHSERVERIP=0:` * Replace the contents after to `:` and the following `,` with what you configured as the server's public facing IP. For example `AUTHSERVERIP=0:localhost` for locally hosted servers * Launch `legouniverse.exe`, through `wine` if on a Unix-like operating system +* Note that if you are on WSL2, you will need to configure the public IP in the server and client to be the IP of the WSL2 instance and not localhost, which can be found by running `ifconfig` in the terminal. Windows defaults to WSL1, so this will not apply to most users. ### Survival From 595afc4a93062e427c537947f092891e2f7022d6 Mon Sep 17 00:00:00 2001 From: Avery Date: Tue, 7 Dec 2021 00:25:19 -0800 Subject: [PATCH 3/3] Revert "Try to load from original zone path before a lowercased one" --- dZoneManager/Zone.cpp | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/dZoneManager/Zone.cpp b/dZoneManager/Zone.cpp index 95bb07bc..68adb943 100644 --- a/dZoneManager/Zone.cpp +++ b/dZoneManager/Zone.cpp @@ -42,15 +42,7 @@ void Zone::LoadZoneIntoMemory() { m_ZonePath = m_ZoneFilePath.substr(0, m_ZoneFilePath.rfind('/') + 1); if (m_ZoneFilePath == "ERR") return; - // try to open with regular cased path first std::ifstream file(m_ZoneFilePath, std::ios::binary); - if (!file) { - // if that fails try the path in lowercase - std::transform(m_ZoneFilePath.begin(), m_ZoneFilePath.end(), m_ZoneFilePath.begin(), ::tolower); - - file.open(m_ZoneFilePath, std::ios::binary); - } - if (file) { BinaryIO::BinaryRead(file, m_ZoneFileFormatVersion); @@ -179,7 +171,8 @@ std::string Zone::GetFilePathForZoneID() { CDZoneTableTable * zoneTable = CDClientManager::Instance()->GetTable("ZoneTable"); const CDZoneTable* zone = zoneTable->Query(this->GetZoneID().GetMapID()); if (zone != nullptr) { - std::string toReturn = "./res/maps/" + zone->zoneName; + std::string toReturn = "./res/maps/" + zone->zoneName; + std::transform(toReturn.begin(), toReturn.end(), toReturn.begin(), ::tolower); return toReturn; }