Merge remote-tracking branch 'upstream/master'

2024-02-19 12:16:07 +05:30
parent 1ad31b0b7c e2be69e345
commit 48e926c2cf
183 changed files with 9534 additions and 5696 deletions
--- a/src/network/network_client.cpp
+++ b/src/network/network_client.cpp
@@ -906,6 +906,9 @@ NetworkRecvStatus ClientNetworkGameSocketHandler::Receive_SERVER_MAP_DONE(Packet
 	/* Say we received the map and loaded it correctly! */
 	SendMapOk();

+	/* As we skipped switch-mode, update the time we "switched". */
+	_switch_mode_time = std::chrono::steady_clock::now();
+
 	ShowClientList();

 	/* New company/spectator (invalid company) or company we want to join is not active