From: Kimmo R. <ki...@us...> - 2014-12-15 20:05:58
|
Update of /cvsroot/arianne/stendhal/src/games/stendhal/client/events In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv16554/src/games/stendhal/client/events Modified Files: SoundEvent.java Log Message: Use InfiniteAudibleArea for events that do not specify radius Index: SoundEvent.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/events/SoundEvent.java,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** SoundEvent.java 23 Apr 2013 15:17:14 -0000 1.15 --- SoundEvent.java 15 Dec 2014 20:05:54 -0000 1.16 *************** *** 1,5 **** /* $Id$ */ /*************************************************************************** ! * (C) Copyright 2003-2010 - Stendhal * *************************************************************************** *************************************************************************** --- 1,5 ---- /* $Id$ */ /*************************************************************************** ! * (C) Copyright 2003-2014 - Stendhal * *************************************************************************** *************************************************************************** *************** *** 15,19 **** --- 15,21 ---- import games.stendhal.client.ClientSingletonRepository; import games.stendhal.client.entity.Entity; + import games.stendhal.client.sound.facade.AudibleArea; import games.stendhal.client.sound.facade.AudibleCircleArea; + import games.stendhal.client.sound.facade.InfiniteAudibleArea; import games.stendhal.client.sound.facade.SoundFileType; import games.stendhal.client.sound.facade.SoundGroup; *************** *** 23,27 **** /** ! * plays a sound * * @author hendrik --- 25,29 ---- /** ! * Plays a sound. * * @author hendrik *************** *** 29,33 **** class SoundEvent extends Event<Entity> { /** ! * executes the event */ @Override --- 31,35 ---- class SoundEvent extends Event<Entity> { /** ! * Executes the event. */ @Override *************** *** 42,53 **** volume = Numeric.intToFloat(event.getInt("volume"), 100.0f); } ! int radius = 100000; if (event.has("radius")) { ! radius = event.getInt("radius"); } SoundGroup group = ClientSingletonRepository.getSound().getGroup(layer.groupName); - String soundName = event.get("sound"); - AudibleCircleArea area = new AudibleCircleArea(Algebra.vecf((float)entity.getX(), (float)entity.getY()), radius/4.0f, radius); group.loadSound(soundName, soundName + ".ogg", SoundFileType.OGG, false); group.play(soundName, volume, 0, area, null, false, true); --- 44,57 ---- volume = Numeric.intToFloat(event.getInt("volume"), 100.0f); } ! String soundName = event.get("sound"); ! AudibleArea area; if (event.has("radius")) { ! int radius = event.getInt("radius"); ! area = new AudibleCircleArea(Algebra.vecf((float) entity.getX(), (float) entity.getY()), radius / 4.0f, radius); ! } else { ! area = new InfiniteAudibleArea(); } SoundGroup group = ClientSingletonRepository.getSound().getGroup(layer.groupName); group.loadSound(soundName, soundName + ".ogg", SoundFileType.OGG, false); group.play(soundName, volume, 0, area, null, false, true); |