diff options
Diffstat (limited to 'src/simulation/elements/GLOW.cpp')
| -rw-r--r-- | src/simulation/elements/GLOW.cpp | 86 |
1 files changed, 43 insertions, 43 deletions
diff --git a/src/simulation/elements/GLOW.cpp b/src/simulation/elements/GLOW.cpp index 373fc51..d8c07ba 100644 --- a/src/simulation/elements/GLOW.cpp +++ b/src/simulation/elements/GLOW.cpp @@ -2,48 +2,48 @@ //#TPT-Directive ElementClass Element_GLOW PT_GLOW 66 Element_GLOW::Element_GLOW() { - Identifier = "DEFAULT_PT_GLOW"; - Name = "GLOW"; - Colour = PIXPACK(0x445464); - MenuVisible = 1; - MenuSection = SC_LIQUID; - Enabled = 1; - - Advection = 0.3f; - AirDrag = 0.02f * CFDS; - AirLoss = 0.98f; - Loss = 0.80f; - Collision = 0.0f; - Gravity = 0.15f; - Diffusion = 0.00f; - HotAir = 0.000f * CFDS; - Falldown = 2; - - Flammable = 0; - Explosive = 0; - Meltable = 0; - Hardness = 2; - - Weight = 40; - - Temperature = R_TEMP+20.0f+273.15f; - HeatConduct = 44; - Description = "Glow, Glows under pressure"; - - State = ST_LIQUID; - Properties = TYPE_LIQUID|PROP_LIFE_DEC; - - LowPressure = IPL; - LowPressureTransition = NT; - HighPressure = IPH; - HighPressureTransition = NT; - LowTemperature = ITL; - LowTemperatureTransition = NT; - HighTemperature = ITH; - HighTemperatureTransition = NT; - - Update = &Element_GLOW::update; - Graphics = &Element_GLOW::graphics; + Identifier = "DEFAULT_PT_GLOW"; + Name = "GLOW"; + Colour = PIXPACK(0x445464); + MenuVisible = 1; + MenuSection = SC_LIQUID; + Enabled = 1; + + Advection = 0.3f; + AirDrag = 0.02f * CFDS; + AirLoss = 0.98f; + Loss = 0.80f; + Collision = 0.0f; + Gravity = 0.15f; + Diffusion = 0.00f; + HotAir = 0.000f * CFDS; + Falldown = 2; + + Flammable = 0; + Explosive = 0; + Meltable = 0; + Hardness = 2; + + Weight = 40; + + Temperature = R_TEMP+20.0f+273.15f; + HeatConduct = 44; + Description = "Glow, Glows under pressure"; + + State = ST_LIQUID; + Properties = TYPE_LIQUID|PROP_LIFE_DEC; + + LowPressure = IPL; + LowPressureTransition = NT; + HighPressure = IPH; + HighPressureTransition = NT; + LowTemperature = ITL; + LowTemperatureTransition = NT; + HighTemperature = ITH; + HighTemperatureTransition = NT; + + Update = &Element_GLOW::update; + Graphics = &Element_GLOW::graphics; } //#TPT-Directive ElementHeader Element_GLOW static int update(UPDATE_FUNC_ARGS) @@ -52,7 +52,7 @@ int Element_GLOW::update(UPDATE_FUNC_ARGS) int r, rx, ry; 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) |
