Permalink
Browse files

disable experimental elements in mods, intro text fix for mods

  • Loading branch information...
jacob1 committed Mar 5, 2017
1 parent cd448a5 commit 83657e8773eb46b4b0e8dab9086baf5f71de5104
Showing with 7 additions and 3 deletions.
  1. +4 −0 data/IntroText.h
  2. +1 −1 src/simulation/elements/180.cpp
  3. +1 −1 src/simulation/elements/181.cpp
  4. +1 −1 src/simulation/elements/182.cpp
@@ -30,8 +30,12 @@ static const char *introTextData =
"\n"
"\bt" MTOS(SAVE_VERSION) "." MTOS(MINOR_VERSION) "." MTOS(BUILD_NUM) " " IDENT_PLATFORM " "
#ifdef SNAPSHOT
#if MOD_ID > 0
"MODVER " MTOS(SNAPSHOT_ID) " "
#else
"SNAPSHOT " MTOS(SNAPSHOT_ID) " "
#endif
#endif
#ifdef X86
"X86 "
#endif
@@ -8,7 +8,7 @@ Element_E180::Element_E180()
Colour = PIXPACK(0xCB6351);
MenuVisible = 1;
MenuSection = SC_SOLIDS;
#if defined(DEBUG) || defined(SNAPSHOT)
#if (defined(DEBUG) || defined(SNAPSHOT)) && MOD_ID == 0
Enabled = 1;
#else
Enabled = 0;
@@ -7,7 +7,7 @@ Element_E181::Element_E181()
Colour = PIXPACK(0xF0F0A0);
MenuVisible = 1;
MenuSection = SC_POWDERS;
#if defined(DEBUG) || defined(SNAPSHOT)
#if (defined(DEBUG) || defined(SNAPSHOT)) && MOD_ID == 0
Enabled = 1;
#else
Enabled = 0;
@@ -14,7 +14,7 @@ Element_E182::Element_E182()
Colour = PIXPACK(0x506030);
MenuVisible = 1;
MenuSection = SC_NUCLEAR;
#if defined(DEBUG) || defined(SNAPSHOT)
#if (defined(DEBUG) || defined(SNAPSHOT)) && MOD_ID == 0
Enabled = 1;
#else
Enabled = 0;

0 comments on commit 83657e8

Please sign in to comment.