Pass objptridx_t to net_destroy_controlcen
This commit is contained in:
parent
03f54571fb
commit
9d0cc8324e
|
@ -45,7 +45,7 @@ extern int maybe_detonate_weapon(object *obj0p, object *obj, vms_vector *pos);
|
||||||
|
|
||||||
void collide_player_and_nasty_robot(objptridx_t player, objptridx_t robot, vms_vector *collision_point);
|
void collide_player_and_nasty_robot(objptridx_t player, objptridx_t robot, vms_vector *collision_point);
|
||||||
|
|
||||||
extern void net_destroy_controlcen(object *controlcen);
|
void net_destroy_controlcen(objptridx_t controlcen);
|
||||||
extern void collide_player_and_powerup(object * player, object * powerup, vms_vector *collision_point);
|
extern void collide_player_and_powerup(object * player, object * powerup, vms_vector *collision_point);
|
||||||
extern int check_effect_blowup(segment *seg,int side,vms_vector *pnt, object *blower, int force_blowup_flag, int remote);
|
extern int check_effect_blowup(segment *seg,int side,vms_vector *pnt, object *blower, int force_blowup_flag, int remote);
|
||||||
extern void apply_damage_to_controlcen(object *controlcen, fix damage, short who);
|
extern void apply_damage_to_controlcen(object *controlcen, fix damage, short who);
|
||||||
|
|
|
@ -1097,12 +1097,12 @@ static void collide_robot_and_player( objptridx_t robot, objptridx_t playerobj
|
||||||
|
|
||||||
// if controlcen == NULL, that means don't do the explosion because the control center
|
// if controlcen == NULL, that means don't do the explosion because the control center
|
||||||
// was actually in another object.
|
// was actually in another object.
|
||||||
void net_destroy_controlcen(object *controlcen)
|
void net_destroy_controlcen(objptridx_t controlcen)
|
||||||
{
|
{
|
||||||
if (Control_center_destroyed != 1) {
|
if (Control_center_destroyed != 1) {
|
||||||
do_controlcen_destroyed_stuff(controlcen);
|
do_controlcen_destroyed_stuff(controlcen);
|
||||||
|
|
||||||
if ((controlcen != NULL) && !(controlcen->flags&(OF_EXPLODING|OF_DESTROYED))) {
|
if ((controlcen != object_none) && !(controlcen->flags&(OF_EXPLODING|OF_DESTROYED))) {
|
||||||
digi_link_sound_to_pos( SOUND_CONTROL_CENTER_DESTROYED, controlcen->segnum, 0, &controlcen->pos, 0, F1_0 );
|
digi_link_sound_to_pos( SOUND_CONTROL_CENTER_DESTROYED, controlcen->segnum, 0, &controlcen->pos, 0, F1_0 );
|
||||||
explode_object(controlcen,0);
|
explode_object(controlcen,0);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1387,7 +1387,7 @@ static void multi_send_message_end()
|
||||||
HUD_init_message(HM_MULTI, "Only %s can kill the reactor this way!",Players[multi_who_is_master()].callsign);
|
HUD_init_message(HM_MULTI, "Only %s can kill the reactor this way!",Players[multi_who_is_master()].callsign);
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
net_destroy_controlcen(NULL);
|
net_destroy_controlcen(object_none);
|
||||||
multi_send_destroy_controlcen(object_none,Player_num);
|
multi_send_destroy_controlcen(object_none,Player_num);
|
||||||
}
|
}
|
||||||
multi_message_index = 0;
|
multi_message_index = 0;
|
||||||
|
@ -1876,7 +1876,7 @@ static void multi_do_controlcen_destroy(const ubyte *buf)
|
||||||
if (objnum != object_none)
|
if (objnum != object_none)
|
||||||
net_destroy_controlcen(&Objects[objnum]);
|
net_destroy_controlcen(&Objects[objnum]);
|
||||||
else
|
else
|
||||||
net_destroy_controlcen(NULL);
|
net_destroy_controlcen(object_none);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue