Implement configurable object sounds: ambient, visit and removal

* If there more than one sound for visit or removal random is played
* At moment only the first ambient sound will be used

lib/mapObjects/CGHeroInstance.cpp

@@ -30,7 +30,7 @@
 #include "../StringConstants.h"
 
 ///helpers
-static void showInfoDialog(const PlayerColor playerID, const ui32 txtID, const ui16 soundID)
+static void showInfoDialog(const PlayerColor playerID, const ui32 txtID, const ui16 soundID = 0)
 {
 	InfoWindow iw;
 	iw.soundID = soundID;
@@ -39,7 +39,7 @@ static void showInfoDialog(const PlayerColor playerID, const ui32 txtID, const u
 	IObjectInterface::cb->sendAndApply(&iw);
 }
 
-static void showInfoDialog(const CGHeroInstance* h, const ui32 txtID, const ui16 soundID)
+static void showInfoDialog(const CGHeroInstance* h, const ui32 txtID, const ui16 soundID = 0)
 {
 	const PlayerColor playerID = h->getOwner();
 	showInfoDialog(playerID,txtID,soundID);
@@ -443,7 +443,7 @@ void CGHeroInstance::onHeroVisit(const CGHeroInstance * h) const
 			txt_id = 103;
 		}
 
-		showInfoDialog(h,txt_id,soundBase::ROGUE);
+		showInfoDialog(h,txt_id);
 	}
 }
 

lib/mapObjects/CGPandoraBox.cpp

@@ -53,7 +53,6 @@ void CGPandoraBox::onHeroVisit(const CGHeroInstance * h) const
 {
 		BlockingDialog bd (true, false);
 		bd.player = h->getOwner();
-		bd.soundID = soundBase::QUEST;
 		bd.text.addTxt (MetaString::ADVOB_TXT, 14);
 		cb->showBlockingDialog (&bd);
 }

lib/mapObjects/CObjectClassesHandler.cpp

@@ -18,6 +18,7 @@
 #include "../CGeneralTextHandler.h"
 #include "../CModHandler.h"
 #include "../JsonNode.h"
+#include "../CSoundBase.h"
 
 #include "CRewardableConstructor.h"
 #include "CommonConstructors.h"
@@ -201,6 +202,7 @@ CObjectClassesHandler::ObjectContainter * CObjectClassesHandler::loadFromJson(co
 	{
 		loadObjectEntry(entry.first, entry.second, obj);
 	}
+
 	return obj;
 }
 
@@ -348,6 +350,22 @@ std::string CObjectClassesHandler::getObjectName(si32 type, si32 subtype) const
 	return getObjectName(type);
 }
 
+SObjectSounds CObjectClassesHandler::getObjectSounds(si32 type) const
+{
+	if(objects.count(type))
+		return objects.at(type)->sounds;
+	logGlobal->error("Access to non existing object of type %d", type);
+	return SObjectSounds();
+}
+
+SObjectSounds CObjectClassesHandler::getObjectSounds(si32 type, si32 subtype) const
+{
+	if(knownSubObjects(type).count(subtype))
+		return getHandlerFor(type, subtype)->getSounds();
+	else
+		return getObjectSounds(type);
+}
+
 std::string CObjectClassesHandler::getObjectHandlerName(si32 type) const
 {
 	return objects.at(type)->handlerName;
@@ -414,6 +432,15 @@ void AObjectTypeHandler::init(const JsonNode & input, boost::optional<std::strin
 	else
 		objectName.reset(input["name"].String());
 
+	for(const JsonNode & node : input["sounds"]["ambient"].Vector())
+		sounds.ambient.push_back(node.String());
+
+	for(const JsonNode & node : input["sounds"]["visit"].Vector())
+		sounds.visit.push_back(node.String());
+
+	for(const JsonNode & node : input["sounds"]["removal"].Vector())
+		sounds.removal.push_back(node.String());
+
 	initTypeData(input);
 }
 
@@ -440,6 +467,11 @@ boost::optional<std::string> AObjectTypeHandler::getCustomName() const
 	return objectName;
 }
 
+SObjectSounds AObjectTypeHandler::getSounds() const
+{
+	return sounds;
+}
+
 void AObjectTypeHandler::addTemplate(const ObjectTemplate & templ)
 {
 	templates.push_back(templ);

lib/mapObjects/CObjectClassesHandler.h

@@ -1,4 +1,4 @@
-/*
+/*
  * CObjectClassesHandler.h, part of VCMI engine
  *
  * Authors: listed in file AUTHORS in main folder
@@ -19,6 +19,21 @@
 class JsonNode;
 class CRandomGenerator;
 
+
+struct SObjectSounds
+{
+	std::vector<std::string> ambient;
+	std::vector<std::string> visit;
+	std::vector<std::string> removal;
+
+	template <typename Handler> void serialize(Handler &h, const int version)
+	{
+		h & ambient;
+		h & visit;
+		h & removal;
+	}
+};
+
 /// Structure that describes placement rules for this object in random map
 struct DLL_LINKAGE RandomMapInfo
 {
@@ -108,6 +123,8 @@ class DLL_LINKAGE AObjectTypeHandler : public boost::noncopyable
 	JsonNode base; /// describes base template
 
 	std::vector<ObjectTemplate> templates;
+
+	SObjectSounds sounds;
 protected:
 	void preInitObject(CGObjectInstance * obj) const;
 	virtual bool objectFilter(const CGObjectInstance *, const ObjectTemplate &) const;
@@ -131,6 +148,7 @@ public:
 
 	/// Returns object-specific name, if set
 	boost::optional<std::string> getCustomName() const;
+	SObjectSounds getSounds() const;
 
 	void addTemplate(const ObjectTemplate & templ);
 	void addTemplate(JsonNode config);
@@ -172,6 +190,10 @@ public:
 			h & typeName;
 			h & subTypeName;
 		}
+		if(version >= 778)
+		{
+			h & sounds;
+		}
 	}
 };
 
@@ -192,6 +214,8 @@ class DLL_LINKAGE CObjectClassesHandler : public IHandlerBase
 		std::map<si32, TObjectTypeHandler> subObjects;
 		std::map<std::string, si32> subIds;//full id from core scope -> subtype
 
+		SObjectSounds sounds;
+
 		template <typename Handler> void serialize(Handler &h, const int version)
 		{
 			h & name;
@@ -203,6 +227,10 @@ class DLL_LINKAGE CObjectClassesHandler : public IHandlerBase
 				h & identifier;
 				h & subIds;
 			}
+			if(version >= 778)
+			{
+				h & sounds;
+			}
 		}
 	};
 
@@ -250,6 +278,9 @@ public:
 	std::string getObjectName(si32 type) const;
 	std::string getObjectName(si32 type, si32 subtype) const;
 
+	SObjectSounds getObjectSounds(si32 type) const;
+	SObjectSounds getObjectSounds(si32 type, si32 subtype) const;
+
 	/// Returns handler string describing the handler (for use in client)
 	std::string getObjectHandlerName(si32 type) const;
 

lib/mapObjects/CObjectHandler.cpp

@@ -53,7 +53,7 @@ static void showInfoDialog(const PlayerColor playerID, const ui32 txtID, const u
 	showInfoDialog(playerID,txtID,soundID);
 }*/
 
-static void showInfoDialog(const CGHeroInstance* h, const ui32 txtID, const ui16 soundID)
+static void showInfoDialog(const CGHeroInstance* h, const ui32 txtID, const ui16 soundID = 0)
 {
 	const PlayerColor playerID = h->getOwner();
 	showInfoDialog(playerID,txtID,soundID);
@@ -271,6 +271,33 @@ std::string CGObjectInstance::getObjectName() const
 	return VLC->objtypeh->getObjectName(ID, subID);
 }
 
+boost::optional<std::string> CGObjectInstance::getAmbientSound() const
+{
+	const auto & sounds = VLC->objtypeh->getObjectSounds(ID, subID).ambient;
+	if(sounds.size())
+		return sounds.front(); // TODO: Support randomization of ambient sounds
+
+	return boost::none;
+}
+
+boost::optional<std::string> CGObjectInstance::getVisitSound() const
+{
+	const auto & sounds = VLC->objtypeh->getObjectSounds(ID, subID).visit;
+	if(sounds.size())
+		return *RandomGeneratorUtil::nextItem(sounds, CRandomGenerator::getDefault());
+
+	return boost::none;
+}
+
+boost::optional<std::string> CGObjectInstance::getRemovalSound() const
+{
+	const auto & sounds = VLC->objtypeh->getObjectSounds(ID, subID).removal;
+	if(sounds.size())
+		return *RandomGeneratorUtil::nextItem(sounds, CRandomGenerator::getDefault());
+
+	return boost::none;
+}
+
 std::string CGObjectInstance::getHoverText(PlayerColor player) const
 {
 	return getObjectName();
@@ -293,7 +320,7 @@ void CGObjectInstance::onHeroVisit( const CGHeroInstance * h ) const
 	case Obj::SANCTUARY:
 		{
 			//You enter the sanctuary and immediately feel as if a great weight has been lifted off your shoulders.  You feel safe here.
-			showInfoDialog(h,114,soundBase::GETPROTECTION);
+			showInfoDialog(h, 114);
 		}
 		break;
 	case Obj::TAVERN:

lib/mapObjects/CObjectHandler.h

@@ -144,6 +144,11 @@ public:
 	std::set<int3> getBlockedOffsets() const; //returns set of relative positions blocked by this object
 	bool isVisitable() const; //returns true if object is visitable
 
+	boost::optional<std::string> getAmbientSound() const;
+	boost::optional<std::string> getVisitSound() const;
+	boost::optional<std::string> getRemovalSound() const;
+
+
 	/** VIRTUAL METHODS **/
 
 	/// Returns true if player can pass through visitable tiles of this object

lib/mapObjects/CQuest.cpp

@@ -37,7 +37,7 @@ CQuest::CQuest()
 }
 
 ///helpers
-static void showInfoDialog(const PlayerColor playerID, const ui32 txtID, const ui16 soundID)
+static void showInfoDialog(const PlayerColor playerID, const ui32 txtID, const ui16 soundID = 0)
 {
 	InfoWindow iw;
 	iw.soundID = soundID;
@@ -46,7 +46,7 @@ static void showInfoDialog(const PlayerColor playerID, const ui32 txtID, const u
 	IObjectInterface::cb->sendAndApply(&iw);
 }
 
-static void showInfoDialog(const CGHeroInstance* h, const ui32 txtID, const ui16 soundID)
+static void showInfoDialog(const CGHeroInstance* h, const ui32 txtID, const ui16 soundID = 0)
 {
 	const PlayerColor playerID = h->getOwner();
 	showInfoDialog(playerID,txtID,soundID);
@@ -685,7 +685,6 @@ void CGSeerHut::onHeroVisit(const CGHeroInstance * h) const
 		{
 			BlockingDialog bd (true, false);
 			bd.player = h->getOwner();
-			bd.soundID = soundBase::QUEST;
 
 			getCompletionText (bd.text, bd.components, isCustom, h);
 
@@ -1085,7 +1084,7 @@ void CGKeymasterTent::onHeroVisit( const CGHeroInstance * h ) const
 	}
 	else
 		txt_id=20;
-	showInfoDialog(h,txt_id,soundBase::CAVEHEAD);
+	showInfoDialog(h, txt_id);
 }
 
 void CGBorderGuard::initObj(CRandomGenerator & rand)
@@ -1116,13 +1115,12 @@ void CGBorderGuard::onHeroVisit(const CGHeroInstance * h) const
 	{
 		BlockingDialog bd (true, false);
 		bd.player = h->getOwner();
-		bd.soundID = soundBase::QUEST;
 		bd.text.addTxt (MetaString::ADVOB_TXT, 17);
 		cb->showBlockingDialog (&bd);
 	}
 	else
 	{
-		showInfoDialog(h,18,soundBase::CAVEHEAD);
+		showInfoDialog(h, 18);
 
 		AddQuest aq;
 		aq.quest = QuestInfo (quest, this, visitablePos());

lib/mapObjects/CRewardableObject.cpp

@@ -500,7 +500,6 @@ void CGPickable::initObj(CRandomGenerator & rand)
 	{
 	case Obj::CAMPFIRE:
 		{
-			soundID = soundBase::experience;
 			int givenRes = rand.nextInt(5);
 			int givenAmm = rand.nextInt(4, 6);
 
@@ -514,7 +513,6 @@ void CGPickable::initObj(CRandomGenerator & rand)
 	case Obj::FLOTSAM:
 		{
 			int type = rand.nextInt(3);
-			soundID = soundBase::GENIE;
 			switch(type)
 			{
 			case 0:
@@ -553,7 +551,6 @@ void CGPickable::initObj(CRandomGenerator & rand)
 		}
 	case Obj::SEA_CHEST:
 		{
-			soundID = soundBase::chest;
 			int hlp = rand.nextInt(99);
 			if(hlp < 20)
 			{
@@ -581,7 +578,6 @@ void CGPickable::initObj(CRandomGenerator & rand)
 		break;
 	case Obj::SHIPWRECK_SURVIVOR:
 		{
-			soundID = soundBase::experience;
 			info.resize(1);
 			loadRandomArtifact(rand, info[0], 55, 20, 20, 5);
 			info[0].message.addTxt(MetaString::ADVOB_TXT, 125);
@@ -594,7 +590,6 @@ void CGPickable::initObj(CRandomGenerator & rand)
 			int hlp = rand.nextInt(99);
 			if(hlp >= 95)
 			{
-				soundID = soundBase::treasure;
 				info.resize(1);
 				loadRandomArtifact(rand, info[0], 100, 0, 0, 0);
 				info[0].message.addTxt(MetaString::ADVOB_TXT,145);
@@ -604,7 +599,6 @@ void CGPickable::initObj(CRandomGenerator & rand)
 			}
 			else if (hlp >= 65)
 			{
-				soundID = soundBase::chest;
 				onSelect.addTxt(MetaString::ADVOB_TXT,146);
 				info.resize(2);
 				info[0].reward.resources[Res::GOLD] = 2000;
@@ -614,7 +608,6 @@ void CGPickable::initObj(CRandomGenerator & rand)
 			}
 			else if(hlp >= 33)
 			{
-				soundID = soundBase::chest;
 				onSelect.addTxt(MetaString::ADVOB_TXT,146);
 				info.resize(2);
 				info[0].reward.resources[Res::GOLD] = 1500;
@@ -624,7 +617,6 @@ void CGPickable::initObj(CRandomGenerator & rand)
 			}
 			else
 			{
-				soundID = soundBase::chest;
 				onSelect.addTxt(MetaString::ADVOB_TXT,146);
 				info.resize(2);
 				info[0].reward.resources[Res::GOLD] = 1000;
@@ -662,11 +654,10 @@ void CGBonusingObject::initObj(CRandomGenerator & rand)
 		configureBonusDuration(visit, Bonus::ONE_BATTLE, type, value, descrID);
 	};
 
-	auto configureMessage = [&](CVisitInfo & visit, int onGrantID, int onVisitedID, soundBase::soundID sound)
+	auto configureMessage = [&](CVisitInfo & visit, int onGrantID, int onVisitedID)
 	{
 		visit.message.addTxt(MetaString::ADVOB_TXT, onGrantID);
 		onVisited.addTxt(MetaString::ADVOB_TXT, onVisitedID);
-		soundID = sound;
 	};
 
 	info.resize(1);
@@ -675,16 +666,16 @@ void CGBonusingObject::initObj(CRandomGenerator & rand)
 	{
 	case Obj::BUOY:
 			blockVisit = true;
-		configureMessage(info[0], 21, 22, soundBase::MORALE);
+		configureMessage(info[0], 21, 22);
 		configureBonus(info[0], Bonus::MORALE, +1, 94);
 		break;
 	case Obj::SWAN_POND:
-		configureMessage(info[0], 29, 30, soundBase::LUCK);
+		configureMessage(info[0], 29, 30);
 		configureBonus(info[0], Bonus::LUCK, 2, 67);
 		info[0].reward.movePercentage = 0;
 		break;
 	case Obj::FAERIE_RING:
-		configureMessage(info[0], 49, 50, soundBase::LUCK);
+		configureMessage(info[0], 49, 50);
 		configureBonus(info[0], Bonus::LUCK, 1, 71);
 		break;
 	case Obj::FOUNTAIN_OF_FORTUNE:
@@ -694,7 +685,6 @@ void CGBonusingObject::initObj(CRandomGenerator & rand)
 		{
 			configureBonus(info[i], Bonus::LUCK, i-1, 69); //NOTE: description have %d that should be replaced with value
 			info[i].message.addTxt(MetaString::ADVOB_TXT, 55);
-			soundID = soundBase::LUCK;
 		}
 		onVisited.addTxt(MetaString::ADVOB_TXT, 56);
 		break;
@@ -706,27 +696,26 @@ void CGBonusingObject::initObj(CRandomGenerator & rand)
 			info[i].limiter.dayOfWeek = i+1;
 			configureBonus(info[i], (i%2) ? Bonus::MORALE : Bonus::LUCK, 1, 68);
 			info[i].message.addTxt(MetaString::ADVOB_TXT, 62);
-			soundID = soundBase::experience;
 		}
 		info.back().limiter.dayOfWeek = 7;
 		configureBonus(info.back(), Bonus::MORALE, 1, 68); // on last day of week
 		configureBonus(info.back(), Bonus::LUCK,   1, 68);
-		configureMessage(info.back(), 62, 63, soundBase::experience);
+		configureMessage(info.back(), 62, 63);
 
 		break;
 	case Obj::MERMAID:
 		blockVisit = true;
-		configureMessage(info[0], 83, 82, soundBase::LUCK);
+		configureMessage(info[0], 83, 82);
 		configureBonus(info[0], Bonus::LUCK, 1, 72);
 		break;
 	case Obj::RALLY_FLAG:
-		configureMessage(info[0], 111, 110, soundBase::MORALE);
+		configureMessage(info[0], 111, 110);
 		configureBonus(info[0], Bonus::MORALE, 1, 102);
 		configureBonus(info[0], Bonus::LUCK,   1, 102);
 		info[0].reward.movePoints = 400;
 		break;
 	case Obj::OASIS:
-		configureMessage(info[0], 95, 94, soundBase::MORALE);
+		configureMessage(info[0], 95, 94);
 		configureBonus(info[0], Bonus::MORALE, 1, 95);
 		info[0].reward.movePoints = 800;
 		break;
@@ -739,20 +728,19 @@ void CGBonusingObject::initObj(CRandomGenerator & rand)
 		info[0].message.addTxt(MetaString::ADVOB_TXT, 140);
 		info[1].message.addTxt(MetaString::ADVOB_TXT, 140);
 		onVisited.addTxt(MetaString::ADVOB_TXT, 141);
-		soundID = soundBase::temple;
 		break;
 	case Obj::WATERING_HOLE:
-		configureMessage(info[0], 166, 167, soundBase::MORALE);
+		configureMessage(info[0], 166, 167);
 		configureBonus(info[0], Bonus::MORALE, 1, 100);
 		info[0].reward.movePoints = 400;
 		break;
 	case Obj::FOUNTAIN_OF_YOUTH:
-		configureMessage(info[0], 57, 58, soundBase::MORALE);
+		configureMessage(info[0], 57, 58);
 		configureBonus(info[0], Bonus::MORALE, 1, 103);
 		info[0].reward.movePoints = 400;
 		break;
 	case Obj::STABLES:
-		configureMessage(info[0], 137, 136, soundBase::STORE);
+		configureMessage(info[0], 137, 136);
 		configureBonusDuration(info[0], Bonus::ONE_WEEK, Bonus::LAND_MOVEMENT, 400, 0);
 		info[0].reward.movePoints = 400;
 		break;
@@ -838,7 +826,6 @@ void CGOnceVisitable::initObj(CRandomGenerator & rand)
 	case Obj::CORPSE:
 		{
 			onEmpty.addTxt(MetaString::ADVOB_TXT, 38);
-			soundID = soundBase::MYSTERY;
 			blockVisit = true;
 			if(rand.nextInt(99) < 20)
 			{
@@ -851,7 +838,6 @@ void CGOnceVisitable::initObj(CRandomGenerator & rand)
 		break;
 	case Obj::LEAN_TO:
 		{
-			soundID = soundBase::GENIE;
 			onEmpty.addTxt(MetaString::ADVOB_TXT, 65);
 			info.resize(1);
 			int type =  rand.nextInt(5); //any basic resource without gold
@@ -863,7 +849,6 @@ void CGOnceVisitable::initObj(CRandomGenerator & rand)
 		break;
 	case Obj::WARRIORS_TOMB:
 		{
-			soundID = soundBase::GRAVEYARD;
 			onSelect.addTxt(MetaString::ADVOB_TXT, 161);
 
 			info.resize(2);
@@ -880,7 +865,6 @@ void CGOnceVisitable::initObj(CRandomGenerator & rand)
 		break;
 	case Obj::WAGON:
 		{
-			soundID = soundBase::GENIE;
 			onVisited.addTxt(MetaString::ADVOB_TXT, 156);
 
 			int hlp = rand.nextInt(99);
@@ -921,7 +905,6 @@ void CGVisitableOPH::initObj(CRandomGenerator & rand)
 	switch(ID)
 	{
 		case Obj::ARENA:
-			soundID = soundBase::NOMAD;
 			info.resize(2);
 			info[0].reward.primary[PrimarySkill::ATTACK] = 2;
 			info[1].reward.primary[PrimarySkill::DEFENSE] = 2;
@@ -932,40 +915,34 @@ void CGVisitableOPH::initObj(CRandomGenerator & rand)
 		case Obj::MERCENARY_CAMP:
 			info.resize(1);
 			info[0].reward.primary[PrimarySkill::ATTACK] = 1;
-			soundID = soundBase::NOMAD;
 			info[0].message.addTxt(MetaString::ADVOB_TXT, 80);
 			onVisited.addTxt(MetaString::ADVOB_TXT, 81);
 			break;
 		case Obj::MARLETTO_TOWER:
 			info.resize(1);
 			info[0].reward.primary[PrimarySkill::DEFENSE] = 1;
-			soundID = soundBase::NOMAD;
 			info[0].message.addTxt(MetaString::ADVOB_TXT, 39);
 			onVisited.addTxt(MetaString::ADVOB_TXT, 40);
 			break;
 		case Obj::STAR_AXIS:
 			info.resize(1);
 			info[0].reward.primary[PrimarySkill::SPELL_POWER] = 1;
-			soundID = soundBase::gazebo;
 			info[0].message.addTxt(MetaString::ADVOB_TXT, 100);
 			onVisited.addTxt(MetaString::ADVOB_TXT, 101);
 			break;
 		case Obj::GARDEN_OF_REVELATION:
 			info.resize(1);
 			info[0].reward.primary[PrimarySkill::KNOWLEDGE] = 1;
-			soundID = soundBase::GETPROTECTION;
 			info[0].message.addTxt(MetaString::ADVOB_TXT, 59);
 			onVisited.addTxt(MetaString::ADVOB_TXT, 60);
 			break;
 		case Obj::LEARNING_STONE:
 			info.resize(1);
 			info[0].reward.gainedExp = 1000;
-			soundID = soundBase::gazebo;
 			info[0].message.addTxt(MetaString::ADVOB_TXT, 143);
 			onVisited.addTxt(MetaString::ADVOB_TXT, 144);
 			break;
 		case Obj::TREE_OF_KNOWLEDGE:
-			soundID = soundBase::gazebo;
 			info.resize(1);
 			canRefuse = true;
 			info[0].reward.gainedLevels = 1;
@@ -1010,7 +987,6 @@ void CGVisitableOPH::initObj(CRandomGenerator & rand)
 				visit.message.addTxt(MetaString::ADVOB_TXT, 66);
 				info.push_back(visit);
 			}
-			soundID = soundBase::gazebo;
 			break;
 		}
 		case Obj::SCHOOL_OF_MAGIC:
@@ -1022,7 +998,6 @@ void CGVisitableOPH::initObj(CRandomGenerator & rand)
 			onSelect.addTxt(MetaString::ADVOB_TXT, 71);
 			onVisited.addTxt(MetaString::ADVOB_TXT, 72);
 			onEmpty.addTxt(MetaString::ADVOB_TXT, 73);
-			soundID = soundBase::faerie;
 			canRefuse = true;
 			break;
 		case Obj::SCHOOL_OF_WAR:
@@ -1034,7 +1009,6 @@ void CGVisitableOPH::initObj(CRandomGenerator & rand)
 			onSelect.addTxt(MetaString::ADVOB_TXT, 158);
 			onVisited.addTxt(MetaString::ADVOB_TXT, 159);
 			onEmpty.addTxt(MetaString::ADVOB_TXT, 160);
-			soundID = soundBase::MILITARY;
 			canRefuse = true;
 			break;
 	}
@@ -1063,17 +1037,14 @@ void CGVisitableOPW::initObj(CRandomGenerator & rand)
 	switch (ID)
 	{
 	case Obj::MYSTICAL_GARDEN:
-		soundID = soundBase::experience;
 		onEmpty.addTxt(MetaString::ADVOB_TXT, 93);
 		info[0].message.addTxt(MetaString::ADVOB_TXT, 92);
 		break;
 	case Obj::WINDMILL:
-		soundID = soundBase::GENIE;
 		onEmpty.addTxt(MetaString::ADVOB_TXT, 169);
 		info[0].message.addTxt(MetaString::ADVOB_TXT, 170);
 		break;
 	case Obj::WATER_WHEEL:
-		soundID = soundBase::GENIE;
 		onEmpty.addTxt(MetaString::ADVOB_TXT, 165);
 		info[0].message.addTxt(MetaString::ADVOB_TXT, 164);
 		break;
@@ -1146,7 +1117,6 @@ void CGMagicSpring::initObj(CRandomGenerator & rand)
 	info.push_back(visit); // two rewards, one for each entrance
 	info.push_back(visit);
 	onEmpty.addTxt(MetaString::ADVOB_TXT, 75);
-	soundID = soundBase::GENIE;
 }
 
 std::vector<int3> CGMagicSpring::getVisitableOffsets() const

lib/mapObjects/MiscObjects.cpp

@@ -40,16 +40,17 @@ static void openWindow(const OpenWindow::EWindow type, const int id1, const int
 	IObjectInterface::cb->sendAndApply(&ow);
 }
 
-static void showInfoDialog(const PlayerColor playerID, const ui32 txtID, const ui16 soundID)
+static void showInfoDialog(const PlayerColor playerID, const ui32 txtID, const ui16 soundID = 0)
 {
 	InfoWindow iw;
-	iw.soundID = soundID;
+	if(soundID)
+		iw.soundID = soundID;
 	iw.player = playerID;
 	iw.text.addTxt(MetaString::ADVOB_TXT,txtID);
 	IObjectInterface::cb->sendAndApply(&iw);
 }
 
-static void showInfoDialog(const CGHeroInstance* h, const ui32 txtID, const ui16 soundID)
+static void showInfoDialog(const CGHeroInstance* h, const ui32 txtID, const ui16 soundID = 0)
 {
 	const PlayerColor playerID = h->getOwner();
 	showInfoDialog(playerID,txtID,soundID);
@@ -1324,7 +1325,6 @@ void CGArtifact::onHeroVisit(const CGHeroInstance * h) const
 		{
 		case Obj::ARTIFACT:
 			{
-				iw.soundID = soundBase::treasure; //play sound only for non-scroll arts
 				iw.components.push_back(Component(Component::ARTIFACT, subID, 0, 0));
 				if(message.length())
 					iw.text << message;
@@ -1446,7 +1446,6 @@ void CGWitchHut::initObj(CRandomGenerator & rand)
 void CGWitchHut::onHeroVisit( const CGHeroInstance * h ) const
 {
 	InfoWindow iw;
-	iw.soundID = soundBase::gazebo;
 	iw.player = h->getOwner();
 	if(!wasVisited(h->tempOwner))
 		cb->setObjProperty(id, CGWitchHut::OBJPROP_VISITED, h->tempOwner.getNum());
@@ -1535,7 +1534,7 @@ void CGMagicWell::onHeroVisit( const CGHeroInstance * h ) const
 	{
 		message = 79;
 	}
-	showInfoDialog(h,message,soundBase::faerie);
+	showInfoDialog(h, message);
 }
 
 std::string CGMagicWell::getHoverText(const CGHeroInstance * hero) const
@@ -1552,7 +1551,6 @@ void CGObservatory::onHeroVisit( const CGHeroInstance * h ) const
 	case Obj::REDWOOD_OBSERVATORY:
 	case Obj::PILLAR_OF_FIRE:
 	{
-		iw.soundID = soundBase::LIGHTHOUSE;
 		iw.text.addTxt(MetaString::ADVOB_TXT,98 + (ID==Obj::PILLAR_OF_FIRE));
 
 		FoWChange fw;
@@ -1589,7 +1587,6 @@ void CGShrine::onHeroVisit( const CGHeroInstance * h ) const
 		cb->setObjProperty(id, CGShrine::OBJPROP_VISITED, h->tempOwner.getNum());
 
 	InfoWindow iw;
-	iw.soundID = soundBase::temple;
 	iw.player = h->getOwner();
 	iw.text.addTxt(MetaString::ADVOB_TXT,127 + ID - 88);
 	iw.text.addTxt(MetaString::SPELL_NAME,spell);
@@ -1678,7 +1675,6 @@ void CGSignBottle::initObj(CRandomGenerator & rand)
 void CGSignBottle::onHeroVisit( const CGHeroInstance * h ) const
 {
 	InfoWindow iw;
-	iw.soundID = soundBase::STORE;
 	iw.player = h->getOwner();
 	iw.text << message;
 	cb->showInfoDialog(&iw);
@@ -1706,7 +1702,6 @@ void CGScholar::onHeroVisit( const CGHeroInstance * h ) const
 	}
 
 	InfoWindow iw;
-	iw.soundID = soundBase::gazebo;
 	iw.player = h->getOwner();
 	iw.text.addTxt(MetaString::ADVOB_TXT,115);
 
@@ -1874,7 +1869,7 @@ void CGMagi::onHeroVisit(const CGHeroInstance * h) const
 {
 	if (ID == Obj::HUT_OF_MAGI)
 	{
-		showInfoDialog(h, 61, soundBase::LIGHTHOUSE);
+		showInfoDialog(h, 61);
 
 		if (!eyelist[subID].empty())
 		{
@@ -1904,7 +1899,7 @@ void CGMagi::onHeroVisit(const CGHeroInstance * h) const
 	}
 	else if (ID == Obj::EYE_OF_MAGI)
 	{
-		showInfoDialog(h,48,soundBase::invalid);
+		showInfoDialog(h, 48);
 	}
 
 }
@@ -1926,7 +1921,6 @@ std::string CGSirens::getHoverText(const CGHeroInstance * hero) const
 void CGSirens::onHeroVisit( const CGHeroInstance * h ) const
 {
 	InfoWindow iw;
-	iw.soundID = soundBase::DANGER;
 	iw.player = h->tempOwner;
 	if(h->hasBonusFrom(Bonus::OBJECT,ID)) //has already visited Sirens
 	{
@@ -2030,18 +2024,17 @@ void CCartographer::onHeroVisit( const CGHeroInstance * h ) const
 			assert(text);
 			BlockingDialog bd (true, false);
 			bd.player = h->getOwner();
-			bd.soundID = soundBase::LIGHTHOUSE;
 			bd.text.addTxt (MetaString::ADVOB_TXT, text);
 			cb->showBlockingDialog (&bd);
 		}
 		else //if he cannot afford
 		{
-			showInfoDialog(h,28,soundBase::CAVEHEAD);
+			showInfoDialog(h, 28);
 		}
 	}
 	else //if he already visited carographer
 	{
-		showInfoDialog(h,24,soundBase::CAVEHEAD);
+		showInfoDialog(h, 24);
 	}
 }
 
@@ -2144,7 +2137,7 @@ void CGLighthouse::onHeroVisit( const CGHeroInstance * h ) const
 	{
 		PlayerColor oldOwner = tempOwner;
 		cb->setOwner(this,h->tempOwner); //not ours? flag it!
-		showInfoDialog(h,69,soundBase::LIGHTHOUSE);
+		showInfoDialog(h, 69);
 		giveBonusTo(h->tempOwner);
 
 		if(oldOwner < PlayerColor::PLAYER_LIMIT) //remove bonus from old owner