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

Unify collide_player_and_materialization_center -> apply_damage_to_player

Browse source 
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.
This commit is contained in:
Kp 2022-07-23 20:58:10 +00:00
parent d9d2bac092
commit f92a978b4a
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
similar/main/collide.cpp
View file

@ -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)