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

Remove apply_damage_to_robot swapping of Stolen_items

Browse source 
It has always been here, but appears to serve no purpose.
`multi_explode_robot_sub` clears `Stolen_items`, so at first look, this
swap seems to be preserving the prior values.  However,
`multi_send_robot_explode` does not use `Stolen_items`, and after
`multi_send_robot_explode` completes, `Stolen_items` is explicitly wiped
again.  Thus, removing the whole block will let the wipe performed by
`multi_explode_robot_sub` stand, producing the same result with less
code.
This commit is contained in:
Kp 2019-07-16 04:00:50 +00:00
parent 91bb7e533c
commit d2da218f94
1 changed files with 0 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
similar/main/collide.cpp
View file

@ -1453,33 +1453,9 @@ int apply_damage_to_robot(const vmobjptridx_t robot, fix damage, objnum_t killer
plr.num_kills_level++;
plr.num_kills_total++;
if (Game_mode & GM_MULTI) {
#if defined(DXX_BUILD_DESCENT_II)
char isthief;
stolen_items_t temp_stolen;
if (robot_is_thief(robptr))
{
isthief=1;
temp_stolen = Stolen_items;
}
else
isthief=0;
#endif
if (multi_explode_robot_sub(robot))
{
#if defined(DXX_BUILD_DESCENT_II)
if (isthief)
Stolen_items = temp_stolen;
#endif
multi_send_robot_explode(robot, killer_objnum);
#if defined(DXX_BUILD_DESCENT_II)
if (isthief)
Stolen_items.fill(255);
#endif
return 1;
}
else