TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Just as in Descent 2, let flares die in lava

Browse source
This commit is contained in:
zicodxx 2011-11-25 22:45:40 +01:00
parent b3329c6c86
commit 1a89c345a8
2 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.txt
View file

@ -3,6 +3,7 @@ D1X-Rebirth Changelog
20111125 20111125
-------- --------
3d/interp.c: Fixed forgotten MALLOC in g3_draw_morphing_model crashing game when rendering morphing robot (created from matcen for example) 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 20111124
-------- --------

1
main/collide.c
View file

@ -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, wi->strength[Difficulty_level]/2+VOLATILE_WALL_DAMAGE_FORCE,
weapon->ctype.laser_info.parent_num ); weapon->ctype.laser_info.parent_num );
weapon->flags |= OF_SHOULD_BE_DEAD; //make flares die in lava
} }
else { else {