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

Add create_smart_children parameter num_smart_children to match D2X

Browse source
This commit is contained in:
Kp 2013-03-23 22:57:04 +00:00
parent 82e23a6cf6
commit 7495502139
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
main/fireball.c
View file

@ -189,7 +189,8 @@ 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) && (objp->type == OBJ_WEAPON))
create_smart_children(objp);
#define NUM_SMART_CHILDREN 6
create_smart_children(objp, NUM_SMART_CHILDREN);
return rval;
}

5
main/laser.c
View file

@ -1252,7 +1252,6 @@ int do_laser_firing(int objnum, int weapon_num, int level, int flags, int nfires
#define MAX_SMART_DISTANCE (F1_0*150)
#define MAX_OBJDISTS 30
#define NUM_SMART_CHILDREN 6
typedef struct {
int objnum;
@ -1296,7 +1295,7 @@ int create_homing_missile(object *objp, int goal_obj, int objtype, int make_soun
// -------------------------------------------------------------------------------------------
// Create the children of a smart bomb, which is a bunch of homing missiles.
void create_smart_children(object *objp)
void create_smart_children(object *objp, int num_smart_children)
{
int parent_type;
int numobjs=0, objnum = 0, sel_objnum, last_sel_objnum = -1;
@ -1358,7 +1357,7 @@ void create_smart_children(object *objp)
blob_id = ((N_weapon_types<ROBOT_SMART_HOMING_ID)?(PLAYER_SMART_HOMING_ID):(ROBOT_SMART_HOMING_ID)); // NOTE: Shareware & reg 1.0 do not have their own Smart structure for bots. It was introduced in 1.4 to make Smart blobs from lvl 7 boss easier to dodge. So if we do not have this type, revert to player's Smart behaviour..,
}
for (i=0; i<NUM_SMART_CHILDREN; i++) {
for (i=0; i<num_smart_children; i++) {
sel_objnum = (numobjs==0)?-1:objlist[(d_rand() * numobjs) >> 15];
if (numobjs > 1)
while (sel_objnum == last_sel_objnum)

2
main/laser.h
View file

@ -92,7 +92,7 @@ extern int do_laser_firing(int objnum, int weapon_id, int level, int flags, int
// Returns object number of laser fired or -1 if not possible to fire laser.
int Laser_create_new_easy(vms_vector * direction, vms_vector * position, int parent, int weapon_type, int make_sound);
extern void create_smart_children(struct object *objp);
extern void create_smart_children(struct object *objp, int num_smart_children);
extern int object_to_object_visibility(struct object *obj1, struct object *obj2, int trans_type);
extern int Muzzle_queue_index;