diff --git a/data/IntroText.h b/data/IntroText.h index 718aebe9f..854106fb6 100644 --- a/data/IntroText.h +++ b/data/IntroText.h @@ -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 diff --git a/src/simulation/elements/180.cpp b/src/simulation/elements/180.cpp index d9a3652a5..0b62c680f 100644 --- a/src/simulation/elements/180.cpp +++ b/src/simulation/elements/180.cpp @@ -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; diff --git a/src/simulation/elements/181.cpp b/src/simulation/elements/181.cpp index f822031d0..d2b32f988 100644 --- a/src/simulation/elements/181.cpp +++ b/src/simulation/elements/181.cpp @@ -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; diff --git a/src/simulation/elements/182.cpp b/src/simulation/elements/182.cpp index 31e970624..3144c0bfd 100644 --- a/src/simulation/elements/182.cpp +++ b/src/simulation/elements/182.cpp @@ -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;