diff options
| author | jacob1 <jfu614@gmail.com> | 2013-03-13 19:54:34 (GMT) |
|---|---|---|
| committer | jacob1 <jfu614@gmail.com> | 2013-03-13 19:54:34 (GMT) |
| commit | e493cf8a475baf2032f879b4c37a6b1ac1b51b54 (patch) | |
| tree | 78d068526f3ea4ed6a2eb5be4c808349b906152e /src/simulation/elements/WATR.cpp | |
| parent | 7a055a9d90ea3464bbdc314df423e2aa768ce2be (diff) | |
| download | powder-e493cf8a475baf2032f879b4c37a6b1ac1b51b54.zip powder-e493cf8a475baf2032f879b4c37a6b1ac1b51b54.tar.gz | |
fix all tab spacing issues in all the element files
Diffstat (limited to 'src/simulation/elements/WATR.cpp')
| -rw-r--r-- | src/simulation/elements/WATR.cpp | 86 |
1 files changed, 43 insertions, 43 deletions
diff --git a/src/simulation/elements/WATR.cpp b/src/simulation/elements/WATR.cpp index 4faf8dc..288c763 100644 --- a/src/simulation/elements/WATR.cpp +++ b/src/simulation/elements/WATR.cpp @@ -2,48 +2,48 @@ //#TPT-Directive ElementClass Element_WATR PT_WATR 2 Element_WATR::Element_WATR() { - Identifier = "DEFAULT_PT_WATR"; - Name = "WATR"; - Colour = PIXPACK(0x2030D0); - MenuVisible = 1; - MenuSection = SC_LIQUID; - Enabled = 1; - - Advection = 0.6f; - AirDrag = 0.01f * CFDS; - AirLoss = 0.98f; - Loss = 0.95f; - Collision = 0.0f; - Gravity = 0.1f; - Diffusion = 0.00f; - HotAir = 0.000f * CFDS; - Falldown = 2; - - Flammable = 0; - Explosive = 0; - Meltable = 0; - Hardness = 20; - - Weight = 30; - - Temperature = R_TEMP-2.0f +273.15f; - HeatConduct = 29; - Description = "Liquid. Conducts electricity. Freezes. Extinguishes fires."; - - State = ST_LIQUID; - Properties = TYPE_LIQUID|PROP_CONDUCTS|PROP_LIFE_DEC|PROP_NEUTPASS; - - LowPressure = IPL; - LowPressureTransition = NT; - HighPressure = IPH; - HighPressureTransition = NT; - LowTemperature = 273.15f; - LowTemperatureTransition = PT_ICEI; - HighTemperature = 373.0f; - HighTemperatureTransition = PT_WTRV; - - Update = &Element_WATR::update; - + Identifier = "DEFAULT_PT_WATR"; + Name = "WATR"; + Colour = PIXPACK(0x2030D0); + MenuVisible = 1; + MenuSection = SC_LIQUID; + Enabled = 1; + + Advection = 0.6f; + AirDrag = 0.01f * CFDS; + AirLoss = 0.98f; + Loss = 0.95f; + Collision = 0.0f; + Gravity = 0.1f; + Diffusion = 0.00f; + HotAir = 0.000f * CFDS; + Falldown = 2; + + Flammable = 0; + Explosive = 0; + Meltable = 0; + Hardness = 20; + + Weight = 30; + + Temperature = R_TEMP-2.0f +273.15f; + HeatConduct = 29; + Description = "Liquid. Conducts electricity. Freezes. Extinguishes fires."; + + State = ST_LIQUID; + Properties = TYPE_LIQUID|PROP_CONDUCTS|PROP_LIFE_DEC|PROP_NEUTPASS; + + LowPressure = IPL; + LowPressureTransition = NT; + HighPressure = IPH; + HighPressureTransition = NT; + LowTemperature = 273.15f; + LowTemperatureTransition = PT_ICEI; + HighTemperature = 373.0f; + HighTemperatureTransition = PT_WTRV; + + Update = &Element_WATR::update; + } //#TPT-Directive ElementHeader Element_WATR static int update(UPDATE_FUNC_ARGS) @@ -52,7 +52,7 @@ int Element_WATR::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) |
