Permalink
Browse files

MERC -> liquids, FUSE/FSEP -> explosives

  • Loading branch information...
jacob1 committed Aug 30, 2015
1 parent ed4678c commit 68b4f1efd6e84d7018ffee7a4e4106d7ccdb0aff
Showing with 3 additions and 3 deletions.
  1. +1 −1 src/simulation/elements/FSEP.cpp
  2. +1 −1 src/simulation/elements/FUSE.cpp
  3. +1 −1 src/simulation/elements/MERC.cpp
@@ -6,7 +6,7 @@ Element_FSEP::Element_FSEP()
Name = "FSEP";
Colour = PIXPACK(0x63AD5F);
MenuVisible = 1;
MenuSection = SC_POWDERS;
MenuSection = SC_EXPLOSIVE;
Enabled = 1;
Advection = 0.7f;
@@ -6,7 +6,7 @@ Element_FUSE::Element_FUSE()
Name = "FUSE";
Colour = PIXPACK(0x0A5706);
MenuVisible = 1;
MenuSection = SC_SOLIDS;
MenuSection = SC_EXPLOSIVE;
Enabled = 1;
Advection = 0.0f;
@@ -6,7 +6,7 @@ Element_MERC::Element_MERC()
Name = "MERC";
Colour = PIXPACK(0x736B6D);
MenuVisible = 1;
MenuSection = SC_ELEC;
MenuSection = SC_LIQUID;
Enabled = 1;
Advection = 0.4f;

0 comments on commit 68b4f1e

Please sign in to comment.