Merge branch 'master' into sidequest/frontier-distance-static-blockers

Author: DevOpsOfChaos

Jenkinsfile

@@ -49,6 +49,7 @@ pipeline {
     options {
         buildDiscarder(logRotator(artifactDaysToKeepStr: '', artifactNumToKeepStr: '14', daysToKeepStr: '14', numToKeepStr: '180'))
         disableConcurrentBuilds()
+        disableResume()
         skipDefaultCheckout(true)
     }
 

data/RTTR/texte/keyboardlayout.txt

@@ -31,6 +31,7 @@ F9:................... Readme
 F10:.................. Settings (UI, ...)
 F11:.................. Musicplayer
 F12:.................. Options window
+Print:................ Take screenshot
 
 Post office:
 

doc/lua/functions.md

@@ -238,6 +238,7 @@ Closes a spot kicking any player or AI there.
 
 **SetAI(level)**  
 Add an AI or change its difficulty.
+Switching a slot to an AI assigns the AI's default name. If a custom name should be kept, call `SetName(name)` after `SetAI(level)`.
 
 **SetName(name)**  
 Change the player's name.

external/libutil

@@ -72,6 +72,15 @@ bool Replay::StopRecording()
     isRecording_ = false;
     file_.Close();
 
+    // Remove empty replay recordings. They are mostly produced when a game is aborted
+    // during startup, for example after an early script error.
+    if(lastGF_ == 0)
+    {
+        boost::system::error_code ec;
+        boost::filesystem::remove(filepath_, ec);
+        return !ec;
+    }
+
     BinaryFile file;
     if(!file.Open(filepath_, OpenFileMode::Read))
         return false;

libs/s25main/Replay.cpp

@@ -928,7 +928,10 @@ bool GameClient::OnGameMessage(const GameMessage_Map_Info& msg)
         OnError(ClientError::InvalidMap);
         return true;
     }
-    mapinfo.filepath = RTTRCONFIG.ExpandPath(s25::folders::mapsPlayed) / portFilename;
+    const auto targetPath =
+      RTTRCONFIG.ExpandPath((msg.mt == MapType::Savegame) ? s25::folders::save : s25::folders::mapsPlayed);
+    bfs::create_directories(targetPath);
+    mapinfo.filepath = targetPath / portFilename;
     mapinfo.type = msg.mt;
 
     // lua script file path

libs/s25main/network/GameClient.cpp

@@ -938,10 +938,12 @@ bool GameServer::OnGameMessage(const GameMessage_Server_Password& msg)
     } else
         playerInfos[msg.senderPlayerID].isHost = false;
 
-    player->sendMsgAsync(new GameMessage_Server_Password(passwordok));
-
     if(passwordok == "false")
+    {
+        player->sendMsg(GameMessage_Server_Password(passwordok));
         KickPlayer(msg.senderPlayerID, KickReason::WrongPassword, __LINE__);
+    } else
+        player->sendMsgAsync(new GameMessage_Server_Password(passwordok));
     return true;
 }
 

libs/s25main/network/GameServer.cpp

@@ -11,3 +11,18 @@ add_library(audioMockup STATIC MockupAudioDriver.h MockupAudioDriver.cpp)
 target_link_libraries(audioMockup PUBLIC audiodrv turtle::turtle)
 target_include_directories(audioMockup INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/..)
 enable_warnings(audioMockup)
+
+# Turtle does not support override for mocked methods, so let's disable the warning
+include(CheckAndAddWarnings)
+
+check_warning(CXX "-Wno-suggest-override" CXX_WARNING__Wno_suggest_override_SUPPORTED)
+
+if (CXX_WARNING__Wno_suggest_override_SUPPORTED)
+	add_library(no_suggest_override INTERFACE)
+	target_compile_options(no_suggest_override INTERFACE
+		$<$<COMPILE_LANGUAGE:CXX>:-Wno-suggest-override>
+	)
+
+    target_link_libraries(videoMockup PRIVATE no_suggest_override)
+    target_link_libraries(audioMockup PRIVATE no_suggest_override)
+endif()

tests/mockupDrivers/CMakeLists.txt

@@ -398,6 +398,26 @@ struct ReplayMapFixture
     }
 };
 
+BOOST_FIXTURE_TEST_CASE(EmptyReplayRecordingIsRemoved, ReplayMapFixture)
+{
+    Replay replay;
+    for(const BasePlayerInfo& player : players)
+        replay.AddPlayer(player);
+    replay.ggs.speed = GameSpeed::VeryFast;
+
+    TmpFile tmpFile(".rpl");
+    BOOST_TEST_REQUIRE(tmpFile.isValid());
+    tmpFile.close();
+    bfs::remove(tmpFile.filePath);
+
+    BOOST_TEST_REQUIRE(replay.StartRecording(tmpFile.filePath, map, 42));
+    BOOST_TEST_REQUIRE(replay.IsRecording());
+    BOOST_TEST(replay.GetLastGF() == 0u);
+
+    BOOST_TEST_REQUIRE(replay.StopRecording());
+    BOOST_TEST_REQUIRE(!replay.IsRecording());
+    BOOST_TEST(!bfs::exists(tmpFile.filePath));
+}
 BOOST_FIXTURE_TEST_CASE(ReplayWithMap, ReplayMapFixture)
 {
     Replay replay;

tests/s25Main/integration/testSerialization.cpp

@@ -244,6 +244,36 @@ BOOST_DATA_TEST_CASE(ClientFollowsConnectProtocol, usesLuaScriptValues, usesLuaS
     }
 }
 
+BOOST_AUTO_TEST_CASE(ClientStoresReceivedSavegamesInSaveFolder)
+{
+    rttr::test::TmpFolder testUserData;
+    rttr::test::ConfigOverride userDataOverride("USERDATA", testUserData);
+
+    GameClient client;
+    GameMessageInterface& clientMsgInterface = client;
+    TestServer server;
+    const auto serverPort = server.tryListen();
+    BOOST_TEST_REQUIRE(serverPort >= 0);
+
+    BOOST_TEST_REQUIRE(client.Connect("localhost", rttr::test::randString(10), rttr::test::randomEnum<ServerType>(),
+                                      serverPort, false, false));
+    clientMsgInterface.OnGameMessage(GameMessage_Player_Id(1));
+    client.GetMainPlayer().sendQueue.clear();
+    clientMsgInterface.OnGameMessage(GameMessage_Server_TypeOK(GameMessage_Server_TypeOK::StatusCode::Ok, ""));
+    client.GetMainPlayer().sendQueue.clear();
+    clientMsgInterface.OnGameMessage(GameMessage_Server_Password("true"));
+    client.GetMainPlayer().sendQueue.clear();
+
+    const auto expectedSavePath = RTTRCONFIG.ExpandPath(s25::folders::save) / "received.sav";
+
+    clientMsgInterface.OnGameMessage(GameMessage_Map_Info("received.sav", MapType::Savegame, 1, 1, 0, 0));
+    const auto msg = boost::dynamic_pointer_cast<GameMessage_MapRequest>(client.GetMainPlayer().sendQueue.pop());
+    BOOST_TEST_REQUIRE(msg);
+    BOOST_TEST(!msg->requestInfo);
+    BOOST_TEST(client.GetMapType() == MapType::Savegame);
+    BOOST_TEST(client.GetMapPath() == expectedSavePath);
+}
+
 BOOST_AUTO_TEST_CASE(ClientDetectsMapBufferOverflow)
 {
     rttr::test::LogAccessor _suppressLogOutput;
@@ -287,6 +317,34 @@ BOOST_AUTO_TEST_CASE(ClientDetectsMapBufferOverflow)
     BOOST_TEST(client.GetState() == ClientState::Stopped);
 }
 
+BOOST_AUTO_TEST_CASE(ClientReportsWrongPasswordResponse)
+{
+    GameClient client;
+    GameMessageInterface& clientMsgInterface = client;
+    MockClientInterface callbacks;
+    client.SetInterface(&callbacks);
+    TestServer server;
+    const auto serverPort = server.tryListen();
+    BOOST_TEST_REQUIRE(serverPort >= 0);
+    const auto serverType = rttr::test::randomEnum<ServerType>();
+    mock::sequence s;
+    MOCK_EXPECT(callbacks.CI_NextConnectState).in(s).with(ConnectState::Initiated).once();
+    MOCK_EXPECT(callbacks.CI_NextConnectState).in(s).with(ConnectState::VerifyServer).once();
+    MOCK_EXPECT(callbacks.CI_NextConnectState).in(s).with(ConnectState::QueryPw).once();
+    MOCK_EXPECT(callbacks.CI_Error).in(s).with(ClientError::WrongPassword).once();
+
+    BOOST_TEST_REQUIRE(client.Connect("localhost", rttr::test::randString(10), serverType, serverPort, false, false));
+    clientMsgInterface.OnGameMessage(GameMessage_Player_Id(1));
+    clientMsgInterface.OnGameMessage(GameMessage_Server_TypeOK(GameMessage_Server_TypeOK::StatusCode::Ok, ""));
+    BOOST_TEST_REQUIRE(boost::dynamic_pointer_cast<GameMessage_Server_Type>(client.GetMainPlayer().sendQueue.pop()));
+    BOOST_TEST_REQUIRE(
+      boost::dynamic_pointer_cast<GameMessage_Server_Password>(client.GetMainPlayer().sendQueue.pop()));
+
+    clientMsgInterface.OnGameMessage(GameMessage_Server_Password("false"));
+
+    BOOST_TEST(client.GetState() == ClientState::Stopped);
+}
+
 using namespace std::chrono_literals;
 
 BOOST_AUTO_TEST_CASE(CanSetNewSpeed)