1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-28 08:48:48 +02:00

Merge pull request #581 from Ewilhan/ewilhan-fixCryptVisitingSound

Fixed Crypt/Pyramid double visit sound.
This commit is contained in:
Alexander Shishkin 2019-05-03 09:13:03 +03:00 committed by GitHub
commit 1965bc0e40
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -98,7 +98,6 @@ bool CBank::wasVisited (PlayerColor player) const
void CBank::onHeroVisit(const CGHeroInstance * h) const
{
int banktext = 0;
ui16 soundID = soundBase::ROGUE;
switch (ID)
{
case Obj::DERELICT_SHIP:
@ -114,7 +113,6 @@ void CBank::onHeroVisit(const CGHeroInstance * h) const
banktext = 122;
break;
case Obj::PYRAMID:
soundID = soundBase::MYSTERY;
banktext = 105;
break;
case Obj::CREATURE_BANK:
@ -124,7 +122,7 @@ void CBank::onHeroVisit(const CGHeroInstance * h) const
}
BlockingDialog bd(true, false);
bd.player = h->getOwner();
bd.soundID = soundID;
bd.soundID = soundBase::invalid; // Sound is handled in json files, else two sounds are played
bd.text.addTxt(MetaString::ADVOB_TXT, banktext);
if (banktext == 32)
bd.text.addReplacement(getObjectName());