summaryrefslogtreecommitdiff
path: root/src/simulation/elements/THRM.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/simulation/elements/THRM.cpp')
-rw-r--r--src/simulation/elements/THRM.cpp86
1 files changed, 43 insertions, 43 deletions
diff --git a/src/simulation/elements/THRM.cpp b/src/simulation/elements/THRM.cpp
index bd14692..3d94a2c 100644
--- a/src/simulation/elements/THRM.cpp
+++ b/src/simulation/elements/THRM.cpp
@@ -2,48 +2,48 @@
//#TPT-Directive ElementClass Element_THRM PT_THRM 65
Element_THRM::Element_THRM()
{
- Identifier = "DEFAULT_PT_THRM";
- Name = "THRM";
- Colour = PIXPACK(0xA08090);
- MenuVisible = 1;
- MenuSection = SC_EXPLOSIVE;
- 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 = "Thermite. Burns at extremely high temperature.";
-
- State = ST_SOLID;
- Properties = TYPE_PART;
-
- LowPressure = IPL;
- LowPressureTransition = NT;
- HighPressure = IPH;
- HighPressureTransition = NT;
- LowTemperature = ITL;
- LowTemperatureTransition = NT;
- HighTemperature = ITH;
- HighTemperatureTransition = NT;
-
- Update = &Element_THRM::update;
-
+ Identifier = "DEFAULT_PT_THRM";
+ Name = "THRM";
+ Colour = PIXPACK(0xA08090);
+ MenuVisible = 1;
+ MenuSection = SC_EXPLOSIVE;
+ 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 = "Thermite. Burns at extremely high temperature.";
+
+ State = ST_SOLID;
+ Properties = TYPE_PART;
+
+ LowPressure = IPL;
+ LowPressureTransition = NT;
+ HighPressure = IPH;
+ HighPressureTransition = NT;
+ LowTemperature = ITL;
+ LowTemperatureTransition = NT;
+ HighTemperature = ITH;
+ HighTemperatureTransition = NT;
+
+ Update = &Element_THRM::update;
+
}
//#TPT-Directive ElementHeader Element_THRM static int update(UPDATE_FUNC_ARGS)
@@ -52,7 +52,7 @@ int Element_THRM::update(UPDATE_FUNC_ARGS)
int r, rx, ry;
for (rx=-2; rx<3; rx++)
for (ry=-2; ry<3; 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)