games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00
Code Issues Releases Activity

Merge branch 'vcmi/master' into 'vcmi/develop'

Browse Source
This commit is contained in:
Ivan Savenko
2024-05-31 09:34:21 +00:00
parent adc3441bda 9121fcdc97
commit df83fa33a1
166 changed files with 2893 additions and 1363 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/mapObjects/CBank.cpp
View File

@@ -398,7 +398,7 @@ void CBank::blockingDialogAnswered(const CGHeroInstance *hero, ui32 answer) cons
if (answer)
{
if (bankConfig) // not looted bank
cb->startBattleI(hero, this, true);
cb->startBattleI(hero, this, !regularUnitPlacement);
else
doVisit(hero);
}

5
lib/mapObjects/CBank.h
View File

@@ -22,6 +22,7 @@ class DLL_LINKAGE CBank : public CArmedInstance
ui32 daycounter;
ui32 resetDuration;
bool coastVisitable;
bool regularUnitPlacement;
void setPropertyDer(ObjProperty what, ObjPropertyID identifier) override;
void doVisit(const CGHeroInstance * hero) const;
@@ -50,6 +51,10 @@ public:
h & bankConfig;
h & resetDuration;
h & coastVisitable;
if (h.version >= Handler::Version::BANK_UNIT_PLACEMENT)
h & regularUnitPlacement;
else if (!h.saving)
regularUnitPlacement = false;
}
friend class CBankInstanceConstructor;