v0.3.5: big consistency pass on how items handle execution

2016-04-19 19:34:08 -04:00
parent a571dc7f02
commit e715e147ff
36 changed files with 163 additions and 151 deletions
@@ -20,14 +20,14 @@
 */
 package com.shatteredpixel.shatteredpixeldungeon.items;

-import java.util.ArrayList;
-
-import com.watabou.noosa.particles.Emitter;
 import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff;
 import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Light;
 import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
 import com.shatteredpixel.shatteredpixeldungeon.effects.particles.FlameParticle;
 import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
+import com.watabou.noosa.particles.Emitter;
+
+import java.util.ArrayList;

 public class Torch extends Item {

@@ -52,6 +52,8 @@ public class Torch extends Item {
 	
 	@Override
 	public void execute( Hero hero, String action ) {
+
+		super.execute( hero, action );
 		
 		if (action.equals( AC_LIGHT )) {
 			
@@ -66,10 +68,6 @@ public class Torch extends Item {
 			Emitter emitter = hero.sprite.centerEmitter();
 			emitter.start( FlameParticle.FACTORY, 0.2f, 3 );
 			
-		} else {
-			
-			super.execute( hero, action );
-			
 		}
 	}