From 49649ab697441740827988f47b4edca26519f068 Mon Sep 17 00:00:00 2001 From: zicodxx Date: Thu, 24 Nov 2011 11:30:29 +0100 Subject: [PATCH] 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 --- CHANGELOG.txt | 1 + main/physics.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 581a2e30e..49f7a3487 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -3,6 +3,7 @@ D1X-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 fa9f67f8b..181e6c6e6 100644 --- a/main/physics.c +++ b/main/physics.c @@ -579,8 +579,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 );