diff --git a/CHANGELOG.txt b/CHANGELOG.txt index c32df6c74..eb9e7a276 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -3,6 +3,7 @@ D2X-Rebirth Changelog 20111124 -------- main/collide.c, main/collide.h, main/fireball.c, main/game.c: Smoothed disabling of friendly fire to re-enable splash damage possible when friendly fire is disabled +main/physics.c: calling scrape_object_on_wall in each case of HIT_WALL more reliable to properly do hazard surface damage and prevent weapon objects from possibly sliding against walls 20111114 -------- diff --git a/main/physics.c b/main/physics.c index 0024c1631..5a884a595 100644 --- a/main/physics.c +++ b/main/physics.c @@ -593,8 +593,8 @@ void do_physics_sim(object *obj) if (wall_part != 0 && moved_time>0 && (hit_speed=-fixdiv(wall_part,moved_time))>0) collide_object_with_wall( obj, hit_speed, WallHitSeg, WallHitSide, &hit_info.hit_pnt ); - else - scrape_object_on_wall(obj, WallHitSeg, WallHitSide, &hit_info.hit_pnt ); + + scrape_object_on_wall(obj, WallHitSeg, WallHitSide, &hit_info.hit_pnt ); Assert( WallHitSeg > -1 ); Assert( WallHitSide > -1 );