From 3ae6f88914ed338468c928593d0b72d8f7b4f4a6 Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan.SHPX@gmail.com>
Date: Wed, 13 May 2015 21:13:14 -0400
Subject: [PATCH] v0.3.0: improved interactions between plants and fire

---
 .../shatteredpixeldungeon/actors/blobs/Fire.java            | 6 ++++++
 .../shatteredpixel/shatteredpixeldungeon/levels/Level.java  | 1 +
 2 files changed, 7 insertions(+)

diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/Fire.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/Fire.java
index 963598517..8b2cd6ac6 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/Fire.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/Fire.java
@@ -27,6 +27,7 @@ import com.shatteredpixel.shatteredpixeldungeon.effects.particles.FlameParticle;
 import com.shatteredpixel.shatteredpixeldungeon.items.Heap;
 import com.shatteredpixel.shatteredpixeldungeon.levels.Level;
 import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain;
+import com.shatteredpixel.shatteredpixeldungeon.plants.Plant;
 import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene;
 
 public class Fire extends Blob {
@@ -92,6 +93,11 @@ public class Fire extends Blob {
 		if (heap != null) {
 			heap.burn();
 		}
+
+		Plant plant = Dungeon.level.plants.get( pos );
+		if (plant != null){
+			plant.wither();
+		}
 	}
 	
 	public void seed( int cell, int amount ) {
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/levels/Level.java b/src/com/shatteredpixel/shatteredpixeldungeon/levels/Level.java
index 2eacdb39b..a92b308d3 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/levels/Level.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/levels/Level.java
@@ -680,6 +680,7 @@ public abstract class Level implements Bundlable {
                 map[pos] == Terrain.EMBERS ||
                 map[pos] == Terrain.EMPTY_DECO) {
             map[pos] = Terrain.GRASS;
+	        flamable[pos] = true;
             GameScene.updateMap( pos );
         }