Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2025-10-10 09:28:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changed how the TryParse function works (and also did some general cleanup along the way)

Browse Source
This commit is contained in:
jadebenn
2024-02-02 17:50:30 -06:00
parent d78b50874c
commit 4f75479a4c
34 changed files with 506 additions and 535 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
dMasterServer/InstanceManager.cpp
View File

@@ -17,7 +17,8 @@
InstanceManager::InstanceManager(Logger* logger, const std::string& externalIP) {
mLogger = logger;
mExternalIP = externalIP;
GeneralUtils::TryParse(Game::config->GetValue("world_port_start"), m_LastPort);
m_LastPort =
GeneralUtils::TryParse<decltype(m_LastPort)>(Game::config->GetValue("world_port_start")).value_or(m_LastPort);
m_LastInstanceID = LWOINSTANCEID_INVALID;
}

2
dMasterServer/InstanceManager.h
View File

@@ -134,7 +134,7 @@ private:
Logger* mLogger;
std::string mExternalIP;
std::vector<Instance*> m_Instances;
unsigned short m_LastPort = 3000;
uint16_t m_LastPort = 3000;
LWOINSTANCEID m_LastInstanceID;
/**

3
dMasterServer/MasterServer.cpp
View File

@@ -89,9 +89,8 @@ int main(int argc, char** argv) {
if (!dConfig::Exists("worldconfig.ini")) LOG("Could not find worldconfig.ini, using default settings");
uint32_t clientNetVersion = 171022;
const auto clientNetVersionString = Game::config->GetValue("client_net_version");
if (!clientNetVersionString.empty()) GeneralUtils::TryParse(clientNetVersionString, clientNetVersion);
const uint32_t clientNetVersion = GeneralUtils::TryParse<uint32_t>(clientNetVersionString).value_or(171022);
LOG("Using net version %i", clientNetVersion);