Merge pull request #44 from diamante0018/develop

Rackover · web-flow · commit 01a15671737e · 2023-08-29T22:35:12.000+02:00
fix(serverlist): remove macro that stops the master from working
diff --git a/src/Components/Modules/ServerList.cpp b/src/Components/Modules/ServerList.cpp
@@ -361,7 +361,6 @@ namespace Components
 		{
 			Discovery::Perform();
 		}
-#ifdef IW4_USE_MASTER_SERVER
 		else if (IsOnlineList())
 		{
 			const auto masterPort = (*Game::com_masterPort)->current.unsignedInt;
@@ -389,7 +388,6 @@ namespace Components
 			// TODO: Figure out what to do with this. Leave it to avoid breaking other code
 			RefreshContainer.host = Network::Address(std::format("{}:{}", masterServerName, masterPort));
 		}
-#endif
 		else if (IsFavouriteList())
 		{
 			LoadFavourties();

Original file line number	Diff line number	Diff line change
`@@ -361,7 +361,6 @@ namespace Components`
`361`	`361`	`{`
`362`	`362`	`Discovery::Perform();`
`363`	`363`	`}`
`364`		`-#ifdef IW4_USE_MASTER_SERVER`
`365`	`364`	`else if (IsOnlineList())`
`366`	`365`	`{`
`367`	`366`	`const auto masterPort = (*Game::com_masterPort)->current.unsignedInt;`
`@@ -389,7 +388,6 @@ namespace Components`
`389`	`388`	`// TODO: Figure out what to do with this. Leave it to avoid breaking other code`
`390`	`389`	`RefreshContainer.host = Network::Address(std::format("{}:{}", masterServerName, masterPort));`
`391`	`390`	`}`
`392`		`-#endif`
`393`	`391`	`else if (IsFavouriteList())`
`394`	`392`	`{`
`395`	`393`	`LoadFavourties();`