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

Add helper to get pointer to reactor definition

Browse source
This commit is contained in:
Kp 2013-03-31 15:04:41 +00:00
parent cb537edd82
commit 255211e28b
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
main/cntrlcen.c
View file

@ -290,10 +290,11 @@ void do_controlcen_frame(object *obj)
controlcen_death_silence = 0;
if ((Control_center_next_fire_time < 0) && !(controlcen_death_silence > F1_0*2)) {
reactor *reactor = get_reactor_definition(obj->id);
if (Players[Player_num].flags & PLAYER_FLAGS_CLOAKED)
best_gun_num = calc_best_gun(Reactors[0].n_guns, obj, &Believed_player_pos);
best_gun_num = calc_best_gun(reactor->n_guns, obj, &Believed_player_pos);
else
best_gun_num = calc_best_gun(Reactors[0].n_guns, obj, &ConsoleObject->pos);
best_gun_num = calc_best_gun(reactor->n_guns, obj, &ConsoleObject->pos);
if (best_gun_num != -1) {
vms_vector vec_to_goal;
@ -396,8 +397,9 @@ void init_controlcen_for_level(void)
} else {
// Compute all gun positions.
objp = &Objects[cntrlcen_objnum];
for (i=0; i<Reactors[0].n_guns; i++)
calc_controlcen_gun_point(&Reactors[0], objp, i);
reactor *reactor = get_reactor_definition(objp->id);
for (i=0; i<reactor->n_guns; i++)
calc_controlcen_gun_point(reactor, objp, i);
Control_center_present = 1;
// Boost control center strength at higher levels.

6
main/cntrlcen.h
View file

@ -57,6 +57,12 @@ static inline int get_reactor_model_number(int id)
return id;
}
static inline reactor *get_reactor_definition(int id)
{
(void)id;
return &Reactors[0];
}
extern int Control_center_been_hit;
extern int Control_center_player_been_seen;
extern int Control_center_next_fire_time;