Merge remote-tracking branch 'upstream/develop' into new-save-format

src/openrct2/network/NetworkBase.cpp

@@ -4171,7 +4171,7 @@ int32_t network_get_current_player_group_index()
 {
     return 0;
 }
-void network_append_chat_log(std::string_view text)
+void network_append_chat_log(std::string_view)
 {
 }
 void network_append_server_log(const utf8* text)

src/openrct2/network/NetworkConnection.h

@@ -18,6 +18,7 @@
 
 #    include <deque>
 #    include <memory>
+#    include <string_view>
 #    include <vector>
 
 class NetworkPlayer;

src/openrct2/network/NetworkGroup.h

@@ -15,6 +15,7 @@
 
 #include <array>
 #include <string>
+#include <string_view>
 
 enum class NetworkPermission : uint32_t;
 

src/openrct2/network/NetworkPacket.cpp

@@ -104,7 +104,7 @@ std::string_view NetworkPacket::ReadString()
     // Skip null terminator.
     BytesRead++;
 
-    return str;
+    return std::string_view(str, stringLen);
 }
 
 #endif

src/openrct2/network/NetworkPlayer.h

@@ -15,6 +15,7 @@
 #include "../world/Map.h"
 
 #include <string>
+#include <string_view>
 #include <unordered_map>
 
 struct NetworkPacket;

src/openrct2/network/network.h

@@ -99,7 +99,6 @@ void network_send_password(const std::string& password);
 
 void network_set_password(const char* password);
 
-void network_print_error();
 void network_append_chat_log(std::string_view text);
 void network_append_server_log(const utf8* text);
 [[nodiscard]] const utf8* network_get_server_name();