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

Switch MAX_REACTORS from #define to constexpr

Browse source
This commit is contained in:
Kp 2016-12-10 17:51:08 +00:00
parent 62a4f001ea
commit 65b05638cc
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/main/cntrlcen.h
View file

@ -63,10 +63,10 @@ void read_model_guns(const char *filename, reactor &);
namespace dsx {
#if defined(DXX_BUILD_DESCENT_I)
#define MAX_REACTORS 1
constexpr unsigned MAX_REACTORS = 1;
constexpr unsigned Num_reactors = 1;
#elif defined(DXX_BUILD_DESCENT_II)
#define MAX_REACTORS 7
constexpr unsigned MAX_REACTORS = 7;
#define DEFAULT_CONTROL_CENTER_EXPLOSION_TIME 30 // Note: Usually uses Alan_pavlish_reactor_times, but can be overridden in editor.
extern unsigned Num_reactors;