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

fix crash when a robot's guided missile explodes (d2x-cvs takeover)

Browse source
This commit is contained in:
zicodxx 2006-10-02 13:16:09 +00:00
parent 0efe8e5ad7
commit 117af93ffc
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
main/laser.c
View file

@ -1536,7 +1536,8 @@ void Laser_do_weapon_sequence(object *obj)
// For homing missiles, turn towards target. (unless it's the guided missile)
if (Weapon_info[obj->id].homing_flag && !(obj->id==GUIDEDMISS_ID && obj==Guided_missile[Objects[obj->ctype.laser_info.parent_num].id] && obj->signature==Guided_missile[Objects[obj->ctype.laser_info.parent_num].id]->signature)) {
if (Weapon_info[obj->id].homing_flag && !(obj->id==GUIDEDMISS_ID && obj->ctype.laser_info.parent_type==OBJ_PLAYER && obj==Guided_missile[Objects[obj->ctype.laser_info.parent_num].id] && obj->signature==Guided_missile[Objects[obj->ctype.laser_info.parent_num].id]->signature))
{
vms_vector vector_to_object, temp_vec;
fix dot=F1_0;
fix speed, max_speed;

3
main/object.c
View file

@ -1416,7 +1416,8 @@ void obj_delete(int objnum)
Assert(obj->type != OBJ_NONE);
Assert(obj != ConsoleObject);
if (obj->type==OBJ_WEAPON && obj->id==GUIDEDMISS_ID) {
if (obj->type==OBJ_WEAPON && obj->id==GUIDEDMISS_ID && obj->ctype.laser_info.parent_type==OBJ_PLAYER)
{
pnum=Objects[obj->ctype.laser_info.parent_num].id;
mprintf ((0,"Deleting a guided missile! Player %d\n\n",pnum));