Merge branch 'master' into jgrpp

# Conflicts:
#	src/cargotype.h
#	src/core/CMakeLists.txt
#	src/core/span_type.hpp
#	src/fileio.cpp
#	src/fios.cpp
#	src/misc/endian_buffer.hpp
#	src/misc_gui.cpp
#	src/saveload/saveload.h
#	src/saveload/vehicle_sl.cpp
#	src/screenshot.cpp
#	src/settings.cpp
#	src/settings_internal.h
#	src/stdafx.h
#	src/string_func.h
#	src/strings.cpp
#	src/strings_func.h
#	src/strings_internal.h

src/network/core/address.cpp

@@ -473,7 +473,7 @@ void NetworkAddress::Listen(int socktype, SocketList *sockets)
  */
 /* static */ ServerAddress ServerAddress::Parse(const std::string &connection_string, uint16_t default_port, CompanyID *company_id)
 {
-	if (StrStartsWith(connection_string, "+")) {
+	if (connection_string.starts_with("+")) {
 		std::string_view invite_code = ParseCompanyFromConnectionString(connection_string, company_id);
 		return ServerAddress(SERVER_ADDRESS_INVITE_CODE, std::string(invite_code));
 	}

src/network/core/http_curl.cpp

@@ -177,7 +177,7 @@ void HttpThread()
 		/* Prepare POST body and URI. */
 		if (!request->data.empty()) {
 			/* When the payload starts with a '{', it is a JSON payload. */
-			if (StrStartsWith(request->data, "{")) {
+			if (request->data.starts_with("{")) {
 				headers = curl_slist_append(headers, "Content-Type: application/json");
 			} else {
 				headers = curl_slist_append(headers, "Content-Type: application/x-www-form-urlencoded");

src/network/core/http_winhttp.cpp

@@ -252,7 +252,7 @@ void NetworkHTTPRequest::Connect()
 		WinHttpSendRequest(this->request, WINHTTP_NO_ADDITIONAL_HEADERS, 0, WINHTTP_NO_REQUEST_DATA, 0, 0, reinterpret_cast<DWORD_PTR>(this));
 	} else {
 		/* When the payload starts with a '{', it is a JSON payload. */
-		LPCWSTR content_type = StrStartsWith(data, "{") ? L"Content-Type: application/json\r\n" : L"Content-Type: application/x-www-form-urlencoded\r\n";
+		LPCWSTR content_type = data.starts_with("{") ? L"Content-Type: application/json\r\n" : L"Content-Type: application/x-www-form-urlencoded\r\n";
 		WinHttpSendRequest(this->request, content_type, -1, const_cast<char *>(data.c_str()), static_cast<DWORD>(data.size()), static_cast<DWORD>(data.size()), reinterpret_cast<DWORD_PTR>(this));
 	}
 }

src/network/network_chat_gui.cpp

@@ -416,7 +416,7 @@ struct NetworkChatWindow : public Window {
 				/* Now any match we make on _chat_tab_completion_buf after this, is perfect */
 			}
 
-			if (tb_buf.size() < cur_name.size() && StrStartsWith(cur_name, tb_buf)) {
+			if (tb_buf.size() < cur_name.size() && cur_name.starts_with(tb_buf)) {
 				/* Save the data it was before completion */
 				if (!second_scan) _chat_tab_completion_buf = tb->buf;
 				_chat_tab_completion_active = true;

src/network/network_coordinator.cpp

@@ -514,7 +514,7 @@ void ClientNetworkCoordinatorSocketHandler::GetListing()
  */
 void ClientNetworkCoordinatorSocketHandler::ConnectToServer(const std::string &invite_code, TCPServerConnecter *connecter)
 {
-	assert(StrStartsWith(invite_code, "+"));
+	assert(invite_code.starts_with("+"));
 
 	if (this->connecter_pre.find(invite_code) != this->connecter_pre.end()) {
 		/* If someone is hammering the refresh key, one can sent out two

src/network/network_gui.cpp

@@ -657,7 +657,7 @@ public:
 			tr.top = DrawStringMultiLine(tr, STR_NETWORK_SERVER_LIST_SERVER_VERSION); // server version
 
 			SetDParamStr(0, sel->connection_string);
-			StringID invite_or_address = StrStartsWith(sel->connection_string, "+") ? STR_NETWORK_SERVER_LIST_INVITE_CODE : STR_NETWORK_SERVER_LIST_SERVER_ADDRESS;
+			StringID invite_or_address = sel->connection_string.starts_with("+") ? STR_NETWORK_SERVER_LIST_INVITE_CODE : STR_NETWORK_SERVER_LIST_SERVER_ADDRESS;
 			tr.top = DrawStringMultiLine(tr, invite_or_address); // server address / invite code
 
 			SetDParam(0, sel->info.start_date);