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

Inline get_num_reactor_models

Browse source
This commit is contained in:
Kp 2015-08-26 03:15:10 +00:00
parent 4434559e8e
commit d3ca71c8d0
2 changed files with 2 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
common/main/cntrlcen.h
View file

@ -63,6 +63,7 @@ void read_model_guns(const char *filename, reactor &);
#if defined(DXX_BUILD_DESCENT_I)
#define MAX_REACTORS 1
const unsigned Num_reactors = 1;
#elif defined(DXX_BUILD_DESCENT_II)
#define MAX_REACTORS 7
#define DEFAULT_CONTROL_CENTER_EXPLOSION_TIME 30 // Note: Usually uses Alan_pavlish_reactor_times, but can be overridden in editor.
@ -79,15 +80,6 @@ void reactor_read_n(PHYSFS_file *fp, partial_range_t<reactor *> r);
extern array<reactor, MAX_REACTORS> Reactors;
static inline int get_num_reactor_models()
{
#if defined(DXX_BUILD_DESCENT_I)
return 1;
#elif defined(DXX_BUILD_DESCENT_II)
return Num_reactors;
#endif
}
static inline int get_reactor_model_number(int id)
{
#if defined(DXX_BUILD_DESCENT_I)
@ -106,8 +98,6 @@ static inline reactor *get_reactor_definition(int id)
return &Reactors[id];
#endif
}
#else
struct reactor;
#endif
//@@extern int N_controlcen_guns;

2
similar/editor/objpage.cpp
View file

@ -247,7 +247,7 @@ int objpage_goto_next_object()
case OBJ_POWERUP:
Cur_object_type = OBJ_CNTRLCEN;
Num_object_subtypes = get_num_reactor_models();
Num_object_subtypes = Num_reactors;
break;
case OBJ_CNTRLCEN: