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

Removed Assert in create_smart_children() which has been taken from D2X code but does not apply for D1X and only will let the Assert fail

Browse source
This commit is contained in:
zicodxx 2012-09-01 23:47:05 +02:00
parent b0df198dc9
commit fcc578c1a8
3 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.txt
View file

@ -3,6 +3,7 @@ D1X-Rebirth Changelog
20120901
--------
main/vers_id.h: Fixed incorrect patch merge introduced in the last commit
main/fireball.c, main/laser.c: Removed Assert in create_smart_children() which has been taken from D2X code but does not apply for D1X and only will let the Assert fail
20120728
--------

2
main/fireball.c
View file

@ -188,7 +188,7 @@ object *object_create_badass_explosion(object *objp, short segnum, vms_vector *
rval = object_create_explosion_sub(objp, segnum, position, size, vclip_type, maxdamage, maxdistance, maxforce, parent );
if (objp != NULL)
if ((objp != NULL) && (objp->type == OBJ_WEAPON))
create_smart_children(objp);
return rval;

1
main/laser.c
View file

@ -1355,7 +1355,6 @@ void create_smart_children(object *objp)
blob_id = PLAYER_SMART_HOMING_ID;
Assert(blob_id != -1); // Hmm, missing data in bitmaps.tbl. Need "children=NN" parameter.
} else {
Assert(objp->type == OBJ_ROBOT);
blob_id = ROBOT_SMART_HOMING_ID;
}