From 1a89c345a8bd6831da693d620de8935c45425fd5 Mon Sep 17 00:00:00 2001
From: zicodxx <zico@dxx-rebirth.com>
Date: Fri, 25 Nov 2011 22:45:40 +0100
Subject: [PATCH] Just as in Descent 2, let flares die in lava

---
 CHANGELOG.txt  | 1 +
 main/collide.c | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 8905bc895..648e77563 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -3,6 +3,7 @@ D1X-Rebirth Changelog
 20111125
 --------
 3d/interp.c: Fixed forgotten MALLOC in g3_draw_morphing_model crashing game when rendering morphing robot (created from matcen for example)
+main/collide.c: Just as in Descent 2, let flares die in lava
 
 20111124
 --------
diff --git a/main/collide.c b/main/collide.c
index a2eb45820..cac401e88 100644
--- a/main/collide.c
+++ b/main/collide.c
@@ -513,6 +513,7 @@ void collide_weapon_and_wall( object * weapon, fix hitspeed, short hitseg, short
 			wi->strength[Difficulty_level]/2+VOLATILE_WALL_DAMAGE_FORCE,
 			weapon->ctype.laser_info.parent_num );
 
+		weapon->flags |= OF_SHOULD_BE_DEAD;		//make flares die in lava
 	}
 	else {