Now loops in order

This commit is contained in:
Andrew 2013-05-29 12:27:58 +12:00
parent f2f5f9630f
commit 2206652364

View File

@ -63,7 +63,7 @@ public enum DisguiseSound {
ZOMBIE(Sound.ZOMBIE_HURT, Sound.STEP_GRASS, Sound.ZOMBIE_DEATH, Sound.ZOMBIE_IDLE, Sound.ZOMBIE_INFECT, Sound.ZOMBIE_METAL, ZOMBIE(Sound.ZOMBIE_HURT, Sound.STEP_GRASS, Sound.ZOMBIE_DEATH, Sound.ZOMBIE_IDLE, Sound.ZOMBIE_INFECT, Sound.ZOMBIE_METAL,
Sound.ZOMBIE_WOODBREAK, Sound.ZOMBIE_WOOD); Sound.ZOMBIE_WOODBREAK, Sound.ZOMBIE_WOOD);
public enum SoundType { public enum SoundType {
CANCEL, DEATH, HURT, IDLE, STEP; CANCEL, DEATH, HURT, IDLE, STEP;
} }
@ -132,7 +132,9 @@ public enum DisguiseSound {
return SoundType.CANCEL; return SoundType.CANCEL;
if (disguiseSounds.get(SoundType.STEP) == Sound.STEP_GRASS && name.startsWith("step.")) if (disguiseSounds.get(SoundType.STEP) == Sound.STEP_GRASS && name.startsWith("step."))
return SoundType.STEP; return SoundType.STEP;
for (SoundType type : disguiseSounds.keySet()) { for (SoundType type : SoundType.values()) {
if (!disguiseSounds.containsKey(type))
continue;
Sound s = disguiseSounds.get(type); Sound s = disguiseSounds.get(type);
if (s != null) if (s != null)
if (CraftSound.getSound(s).equals(name)) if (CraftSound.getSound(s).equals(name))