diff --git a/editor/objpage.c b/editor/objpage.c index cfdc603fd..a918d0465 100644 --- a/editor/objpage.c +++ b/editor/objpage.c @@ -84,6 +84,8 @@ void draw_object_picture(int id, vms_angvec *orient_angles, int type) break; case OBJ_CNTRLCEN: + draw_model_picture(get_reactor_model_number(id), orient_angles); + break; case OBJ_CLUTTER: draw_model_picture(Reactors[id].model_num, orient_angles); break; @@ -247,7 +249,7 @@ int objpage_goto_next_object() case OBJ_POWERUP: Cur_object_type = OBJ_CNTRLCEN; - Num_object_subtypes = Num_reactors; + Num_object_subtypes = get_num_reactor_models(); break; case OBJ_CNTRLCEN: diff --git a/main/cntrlcen.h b/main/cntrlcen.h index 60fe023a9..38e1c7e01 100644 --- a/main/cntrlcen.h +++ b/main/cntrlcen.h @@ -52,6 +52,16 @@ extern int Num_reactors; extern reactor Reactors[MAX_REACTORS]; +static inline int get_num_reactor_models() +{ + return Num_reactors; +} + +static inline int get_reactor_model_number(int id) +{ + return Reactors[id].model_num; +} + //@@extern int N_controlcen_guns; extern int Control_center_been_hit; extern int Control_center_player_been_seen;