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

Compute Boss_invulnerable_dot as needed

Browse source
This commit is contained in:
Kp 2013-09-22 03:50:16 +00:00
parent 1ff627f85e
commit 3118fff45e
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
d2x-rebirth/main/ai.c
View file

@ -3610,7 +3610,6 @@ void init_robots_for_level(void)
Buddy_objnum = 0;
Buddy_allowed_to_talk = 0;
Boss_invulnerable_dot = F1_0/4 - i2f(Difficulty_level)/8;
Boss_dying_start_time = 0;
Ai_last_missile_camera = -1;

7
d2x-rebirth/main/collide.c
View file

@ -1356,7 +1356,10 @@ extern int boss_spew_robot(object *objp, vms_vector *pos);
//--ubyte Boss_invulnerable_spot[NUM_D2_BOSSES] = {0,0,0,0,1,1}; // Set byte if boss is invulnerable in all but a certain spot. (Dot product fvec|vec_to_collision < BOSS_INVULNERABLE_DOT)
//#define BOSS_INVULNERABLE_DOT 0 // If a boss is invulnerable over most of his body, fvec(dot)vec_to_collision must be less than this for damage to occur.
int Boss_invulnerable_dot = 0;
static inline int Boss_invulnerable_dot()
{
return F1_0/4 - i2f(Difficulty_level)/8;
}
int Buddy_gave_hint_count = 5;
fix64 Last_time_buddy_gave_hint = 0;
@ -1393,7 +1396,7 @@ int do_boss_weapon_collision(object *robot, object *weapon, vms_vector *collisio
vm_vec_sub(&tvec1, collision_point, &robot->pos);
vm_vec_normalize_quick(&tvec1); // Note, if BOSS_INVULNERABLE_DOT is close to F1_0 (in magnitude), then should probably use non-quick version.
dot = vm_vec_dot(&tvec1, &robot->orient.fvec);
if (dot > Boss_invulnerable_dot) {
if (dot > Boss_invulnerable_dot()) {
int new_obj;
int segnum;