summaryrefslogtreecommitdiff
path: root/src/simulation/elements/BRMT.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/simulation/elements/BRMT.cpp')
-rw-r--r--src/simulation/elements/BRMT.cpp86
1 files changed, 43 insertions, 43 deletions
diff --git a/src/simulation/elements/BRMT.cpp b/src/simulation/elements/BRMT.cpp
index 5ac2315..cf4f99d 100644
--- a/src/simulation/elements/BRMT.cpp
+++ b/src/simulation/elements/BRMT.cpp
@@ -2,48 +2,48 @@
//#TPT-Directive ElementClass Element_BRMT PT_BRMT 30
Element_BRMT::Element_BRMT()
{
- Identifier = "DEFAULT_PT_BRMT";
- Name = "BRMT";
- Colour = PIXPACK(0x705060);
- MenuVisible = 1;
- MenuSection = SC_POWDERS;
- Enabled = 1;
-
- Advection = 0.4f;
- AirDrag = 0.04f * CFDS;
- AirLoss = 0.94f;
- Loss = 0.95f;
- Collision = -0.1f;
- Gravity = 0.3f;
- Diffusion = 0.00f;
- HotAir = 0.000f * CFDS;
- Falldown = 1;
-
- Flammable = 0;
- Explosive = 0;
- Meltable = 2;
- Hardness = 2;
-
- Weight = 90;
-
- Temperature = R_TEMP+0.0f +273.15f;
- HeatConduct = 211;
- Description = "Broken metal.";
-
- State = ST_SOLID;
- Properties = TYPE_PART|PROP_CONDUCTS|PROP_LIFE_DEC|PROP_HOT_GLOW;
-
- LowPressure = IPL;
- LowPressureTransition = NT;
- HighPressure = IPH;
- HighPressureTransition = NT;
- LowTemperature = ITL;
- LowTemperatureTransition = NT;
- HighTemperature = 1273.0f;
- HighTemperatureTransition = PT_LAVA;
-
- Update = &Element_BRMT::update;
-
+ Identifier = "DEFAULT_PT_BRMT";
+ Name = "BRMT";
+ Colour = PIXPACK(0x705060);
+ MenuVisible = 1;
+ MenuSection = SC_POWDERS;
+ Enabled = 1;
+
+ Advection = 0.4f;
+ AirDrag = 0.04f * CFDS;
+ AirLoss = 0.94f;
+ Loss = 0.95f;
+ Collision = -0.1f;
+ Gravity = 0.3f;
+ Diffusion = 0.00f;
+ HotAir = 0.000f * CFDS;
+ Falldown = 1;
+
+ Flammable = 0;
+ Explosive = 0;
+ Meltable = 2;
+ Hardness = 2;
+
+ Weight = 90;
+
+ Temperature = R_TEMP+0.0f +273.15f;
+ HeatConduct = 211;
+ Description = "Broken metal.";
+
+ State = ST_SOLID;
+ Properties = TYPE_PART|PROP_CONDUCTS|PROP_LIFE_DEC|PROP_HOT_GLOW;
+
+ LowPressure = IPL;
+ LowPressureTransition = NT;
+ HighPressure = IPH;
+ HighPressureTransition = NT;
+ LowTemperature = ITL;
+ LowTemperatureTransition = NT;
+ HighTemperature = 1273.0f;
+ HighTemperatureTransition = PT_LAVA;
+
+ Update = &Element_BRMT::update;
+
}
//#TPT-Directive ElementHeader Element_BRMT static int update(UPDATE_FUNC_ARGS)
@@ -57,7 +57,7 @@ int Element_BRMT::update(UPDATE_FUNC_ARGS)
tempFactor = 2;
for (rx=-1; rx<2; rx++)
for (ry=-1; ry<2; ry++)
- if (x+rx>=0 && y+ry>0 && x+rx<XRES && y+ry<YRES && (rx || ry))
+ if (BOUNDS_CHECK && (rx || ry))
{
r = pmap[y+ry][x+rx];
if (!r)