diff options
Diffstat (limited to 'src/simulation/elements/ICEI.cpp')
| -rw-r--r-- | src/simulation/elements/ICEI.cpp | 86 |
1 files changed, 43 insertions, 43 deletions
diff --git a/src/simulation/elements/ICEI.cpp b/src/simulation/elements/ICEI.cpp index 95210bb..74386a6 100644 --- a/src/simulation/elements/ICEI.cpp +++ b/src/simulation/elements/ICEI.cpp @@ -2,48 +2,48 @@ //#TPT-Directive ElementClass Element_ICEI PT_ICEI 13 Element_ICEI::Element_ICEI() { - Identifier = "DEFAULT_PT_ICEI"; - Name = "ICE"; - Colour = PIXPACK(0xA0C0FF); - MenuVisible = 1; - MenuSection = SC_SOLIDS; - Enabled = 1; - - Advection = 0.0f; - AirDrag = 0.00f * CFDS; - AirLoss = 0.90f; - Loss = 0.00f; - Collision = 0.0f; - Gravity = 0.0f; - Diffusion = 0.00f; - HotAir = -0.0003f* CFDS; - Falldown = 0; - - Flammable = 0; - Explosive = 0; - Meltable = 0; - Hardness = 20; - - Weight = 100; - - Temperature = R_TEMP-50.0f+273.15f; - HeatConduct = 46; - Description = "Solid. Freezes water. Crushes under pressure. Cools down air."; - - State = ST_SOLID; - Properties = TYPE_SOLID|PROP_LIFE_DEC|PROP_NEUTPASS; - - LowPressure = IPL; - LowPressureTransition = NT; - HighPressure = 0.8f; - HighPressureTransition = PT_SNOW; - LowTemperature = ITL; - LowTemperatureTransition = NT; - HighTemperature = 252.05f; - HighTemperatureTransition = ST; - - Update = &Element_ICEI::update; - + Identifier = "DEFAULT_PT_ICEI"; + Name = "ICE"; + Colour = PIXPACK(0xA0C0FF); + MenuVisible = 1; + MenuSection = SC_SOLIDS; + Enabled = 1; + + Advection = 0.0f; + AirDrag = 0.00f * CFDS; + AirLoss = 0.90f; + Loss = 0.00f; + Collision = 0.0f; + Gravity = 0.0f; + Diffusion = 0.00f; + HotAir = -0.0003f* CFDS; + Falldown = 0; + + Flammable = 0; + Explosive = 0; + Meltable = 0; + Hardness = 20; + + Weight = 100; + + Temperature = R_TEMP-50.0f+273.15f; + HeatConduct = 46; + Description = "Solid. Freezes water. Crushes under pressure. Cools down air."; + + State = ST_SOLID; + Properties = TYPE_SOLID|PROP_LIFE_DEC|PROP_NEUTPASS; + + LowPressure = IPL; + LowPressureTransition = NT; + HighPressure = 0.8f; + HighPressureTransition = PT_SNOW; + LowTemperature = ITL; + LowTemperatureTransition = NT; + HighTemperature = 252.05f; + HighTemperatureTransition = ST; + + Update = &Element_ICEI::update; + } //#TPT-Directive ElementHeader Element_ICEI static int update(UPDATE_FUNC_ARGS) @@ -56,7 +56,7 @@ int Element_ICEI::update(UPDATE_FUNC_ARGS) } 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) |
