From f92a978b4a943908eefc3c438f92ef5f7d328bef Mon Sep 17 00:00:00 2001 From: Kp Date: Sat, 23 Jul 2022 20:58:10 +0000 Subject: [PATCH] Unify collide_player_and_materialization_center -> apply_damage_to_player D2 changed the rule for the parameter `killer`. Split that out to a variable and combine the underlying call. This does not change the game semantics. --- similar/main/collide.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/similar/main/collide.cpp b/similar/main/collide.cpp index 96cd3b895..379da89ce 100644 --- a/similar/main/collide.cpp +++ b/similar/main/collide.cpp @@ -2304,10 +2304,11 @@ void collide_player_and_materialization_center(const vmobjptridx_t objp) bump_one_object(objp, exit_dir, 64*F1_0); #if defined(DXX_BUILD_DESCENT_I) - apply_damage_to_player(objp, object_none, 4*F1_0, apply_damage_player::always); + const auto killer = object_none; #elif defined(DXX_BUILD_DESCENT_II) - apply_damage_to_player(objp, objp, 4*F1_0, apply_damage_player::always); // Changed, MK, 2/19/96, make killer the player, so if you die in matcen, will say you killed yourself + auto &&killer = objp; // Changed, MK, 2/19/96, make killer the player, so if you die in matcen, will say you killed yourself #endif + apply_damage_to_player(objp, killer, 4*F1_0, apply_damage_player::always); } void collide_robot_and_materialization_center(const d_robot_info_array &Robot_info, const vmobjptridx_t objp)