Pārlūkot izejas kodu

fixed object types playing sounds

rhn 11 gadi atpakaļ
vecāks
revīzija
e4fce8fc8f
1 mainītis faili ar 9 papildinājumiem un 9 dzēšanām
  1. 9 9
      client/CPlayerInterface.cpp

+ 9 - 9
client/CPlayerInterface.cpp

@@ -1516,16 +1516,16 @@ void CPlayerInterface::centerView (int3 pos, int focusTime)
 void CPlayerInterface::objectRemoved( const CGObjectInstance *obj )
 {
 	EVENT_HANDLER_CALLED_BY_CLIENT;
-
-	std::string handlerName = VLC->objtypeh->getObjectHandlerName(obj->ID);
-	if (handlerName == "pickable") {
-		waitWhileDialog();
-		CCS->soundh->playSoundFromSet(CCS->soundh->pickupSounds);
-	} else if ((handlerName == "monster") || (handlerName == "hero")) {
-		waitWhileDialog();
-		CCS->soundh->playSound(soundBase::KillFade);
+	if (LOCPLINT->cb->getCurrentPlayer() == playerID) {
+		std::string handlerName = VLC->objtypeh->getObjectHandlerName(obj->ID);
+		if ((handlerName == "pickable") || (handlerName == "scholar") || (handlerName== "artifact") || (handlerName == "pandora") {
+			waitWhileDialog();
+			CCS->soundh->playSoundFromSet(CCS->soundh->pickupSounds);
+		} else if ((handlerName == "monster") || (handlerName == "hero")) {
+			waitWhileDialog();
+			CCS->soundh->playSound(soundBase::KillFade);
+		}
 	}
-	
 	if(obj->ID == Obj::HERO  &&  obj->tempOwner == playerID)
 	{
 		const CGHeroInstance *h = static_cast<const CGHeroInstance*>(obj);