games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-03-21 21:17:49 +02:00
Code Issues Releases Activity

Merge pull request #4593 from IvanSavenko/bugfixing

Browse Source 
Fixes for issues reported on Discord
This commit is contained in:
Ivan Savenko 2024-09-14 15:46:04 +03:00 committed by GitHub
commit 7209969d9d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CI/msvc/before_install.sh
View File

@ -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

2
lib/battle/BattleInfo.cpp
View File

@ -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(); };

0
lib/mapObjects/CreatureBank.cpp
View File

0
lib/mapObjects/CreatureBank.h
View File