From 95df330843f728ec1fe2daacdac1da58c5886160 Mon Sep 17 00:00:00 2001 From: Ivan Savenko Date: Sat, 14 Sep 2024 10:47:16 +0000 Subject: [PATCH 1/3] Remove unused files --- lib/mapObjects/CreatureBank.cpp | 0 lib/mapObjects/CreatureBank.h | 0 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 lib/mapObjects/CreatureBank.cpp delete mode 100644 lib/mapObjects/CreatureBank.h diff --git a/lib/mapObjects/CreatureBank.cpp b/lib/mapObjects/CreatureBank.cpp deleted file mode 100644 index e69de29bb..000000000 diff --git a/lib/mapObjects/CreatureBank.h b/lib/mapObjects/CreatureBank.h deleted file mode 100644 index e69de29bb..000000000 From 90733cfe0e984e447249742a59844d362d3556c8 Mon Sep 17 00:00:00 2001 From: Ivan Savenko Date: Sat, 14 Sep 2024 11:02:23 +0000 Subject: [PATCH 2/3] Do not place obstacles during sieges --- lib/battle/BattleInfo.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/battle/BattleInfo.cpp b/lib/battle/BattleInfo.cpp index 401a656d2..5bbebc49c 100644 --- a/lib/battle/BattleInfo.cpp +++ b/lib/battle/BattleInfo.cpp @@ -209,7 +209,7 @@ BattleInfo * BattleInfo::setupBattle(const int3 & tile, TerrainId terrain, const } //randomize obstacles - if (layout.obstaclesAllowed) + if (layout.obstaclesAllowed && !town) { RandGen r{}; auto ourRand = [&](){ return r.rand(); }; From 45e000c3950d70aa785c347c390823c7bc4c1c3d Mon Sep 17 00:00:00 2001 From: Ivan Savenko Date: Sat, 14 Sep 2024 11:03:44 +0000 Subject: [PATCH 3/3] Revert "MSVC CI script: Don't run vswhere to find dumpbin.exe, since it is not used" This reverts commit 8bca2fa6439331884a4dcab1418e5f4f3bdac4f0. --- CI/msvc/before_install.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CI/msvc/before_install.sh b/CI/msvc/before_install.sh index 1a040d421..5388e84f8 100644 --- a/CI/msvc/before_install.sh +++ b/CI/msvc/before_install.sh @@ -5,3 +5,6 @@ curl -LfsS -o "vcpkg-export-${VCMI_BUILD_PLATFORM}-windows-v143.7z" \ #rm -r -f vcpkg/installed/${VCMI_BUILD_PLATFORM}-windows/debug #mkdir -p vcpkg/installed/${VCMI_BUILD_PLATFORM}-windows/debug/bin #cp vcpkg/installed/${VCMI_BUILD_PLATFORM}-windows/bin/* vcpkg/installed/${VCMI_BUILD_PLATFORM}-windows/debug/bin + +DUMPBIN_DIR=$(vswhere -latest -find **/dumpbin.exe | head -n 1) +dirname "$DUMPBIN_DIR" > $GITHUB_PATH