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 8f95f0120d
commit 62ef6abefe
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
main/cntrlcen.c
View file

@ -348,7 +348,7 @@ 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 = &Reactors[obj->id];
reactor *reactor = get_reactor_definition(obj->id);
if (Players[Player_num].flags & PLAYER_FLAGS_CLOAKED)
best_gun_num = calc_best_gun(reactor->n_guns, obj, &Believed_player_pos);
else
@ -459,7 +459,7 @@ void init_controlcen_for_level(void)
} else {
// Compute all gun positions.
objp = &Objects[cntrlcen_objnum];
reactor *reactor = &Reactors[objp->id];
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;

5
main/cntrlcen.h
View file

@ -62,6 +62,11 @@ static inline int get_reactor_model_number(int id)
return Reactors[id].model_num;
}
static inline reactor *get_reactor_definition(int id)
{
return &Reactors[id];
}
//@@extern int N_controlcen_guns;
extern int Control_center_been_hit;
extern int Control_center_player_been_seen;