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

Fold robot kamikaze explode_object calls

Browse source
This commit is contained in:
Kp 2022-07-30 17:42:59 +00:00
parent dc674eafe8
commit 3bc110ec01
2 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
similar/main/collide.cpp
View file

@ -1508,11 +1508,13 @@ int apply_damage_to_robot(const d_robot_info_array &Robot_info, const vmobjptrid
#if defined(DXX_BUILD_DESCENT_II)
if (get_robot_id(robot) == SPECIAL_REACTOR_ROBOT)
special_reactor_stuff();
if (robptr.kamikaze)
explode_object(LevelUniqueObjectState, Robot_info, LevelSharedSegmentState, LevelUniqueSegmentState, robot, 1); // Kamikaze, explode right away, IN YOUR FACE!
else
#endif
explode_object(LevelUniqueObjectState, Robot_info, LevelSharedSegmentState, LevelUniqueSegmentState, robot, STANDARD_EXPL_DELAY);
// Kamikaze, explode right away, IN YOUR FACE!
explode_object(LevelUniqueObjectState, Robot_info, LevelSharedSegmentState, LevelUniqueSegmentState, robot,
#if defined(DXX_BUILD_DESCENT_II)
robptr.kamikaze ? 1 :
#endif
STANDARD_EXPL_DELAY);
}
return 1;
} else

10
similar/main/multibot.cpp
View file

@ -968,11 +968,13 @@ int multi_explode_robot_sub(const d_robot_info_array &Robot_info, const vmobjptr
#if defined(DXX_BUILD_DESCENT_II)
if (robot_id == SPECIAL_REACTOR_ROBOT)
special_reactor_stuff();
if (Robot_info[robot_id].kamikaze)
explode_object(LevelUniqueObjectState, Robot_info, LevelSharedSegmentState, LevelUniqueSegmentState, robot, 1); // Kamikaze, explode right away, IN YOUR FACE!
else
#endif
explode_object(LevelUniqueObjectState, Robot_info, LevelSharedSegmentState, LevelUniqueSegmentState, robot, STANDARD_EXPL_DELAY);
// Kamikaze, explode right away, IN YOUR FACE!
explode_object(LevelUniqueObjectState, Robot_info, LevelSharedSegmentState, LevelUniqueSegmentState, robot,
#if defined(DXX_BUILD_DESCENT_II)
Robot_info[robot_id].kamikaze ? 1 :
#endif
STANDARD_EXPL_DELAY);
}
return 1;