summaryrefslogtreecommitdiff
path: root/src/simulation/elements/WARP.cpp
diff options
context:
space:
mode:
authorjacob1 <jfu614@gmail.com>2013-03-13 19:54:34 (GMT)
committer jacob1 <jfu614@gmail.com>2013-03-13 19:54:34 (GMT)
commite493cf8a475baf2032f879b4c37a6b1ac1b51b54 (patch)
tree78d068526f3ea4ed6a2eb5be4c808349b906152e /src/simulation/elements/WARP.cpp
parent7a055a9d90ea3464bbdc314df423e2aa768ce2be (diff)
downloadpowder-e493cf8a475baf2032f879b4c37a6b1ac1b51b54.zip
powder-e493cf8a475baf2032f879b4c37a6b1ac1b51b54.tar.gz
fix all tab spacing issues in all the element files
Diffstat (limited to 'src/simulation/elements/WARP.cpp')
-rw-r--r--src/simulation/elements/WARP.cpp86
1 files changed, 43 insertions, 43 deletions
diff --git a/src/simulation/elements/WARP.cpp b/src/simulation/elements/WARP.cpp
index 312e2e6..88fc24c 100644
--- a/src/simulation/elements/WARP.cpp
+++ b/src/simulation/elements/WARP.cpp
@@ -2,48 +2,48 @@
//#TPT-Directive ElementClass Element_WARP PT_WARP 96
Element_WARP::Element_WARP()
{
- Identifier = "DEFAULT_PT_WARP";
- Name = "WARP";
- Colour = PIXPACK(0x101010);
- MenuVisible = 1;
- MenuSection = SC_NUCLEAR;
- Enabled = 1;
-
- Advection = 0.8f;
- AirDrag = 0.00f * CFDS;
- AirLoss = 0.9f;
- Loss = 0.70f;
- Collision = -0.1f;
- Gravity = 0.0f;
- Diffusion = 3.00f;
- HotAir = 0.000f * CFDS;
- Falldown = 0;
-
- Flammable = 0;
- Explosive = 0;
- Meltable = 0;
- Hardness = 30;
-
- Weight = 1;
-
- Temperature = R_TEMP +273.15f;
- HeatConduct = 100;
- Description = "Displaces other elements.";
-
- State = ST_GAS;
- Properties = TYPE_GAS|PROP_LIFE_DEC|PROP_LIFE_KILL;
-
- LowPressure = IPL;
- LowPressureTransition = NT;
- HighPressure = IPH;
- HighPressureTransition = NT;
- LowTemperature = ITL;
- LowTemperatureTransition = NT;
- HighTemperature = ITH;
- HighTemperatureTransition = NT;
-
- Update = &Element_WARP::update;
- Graphics = &Element_WARP::graphics;
+ Identifier = "DEFAULT_PT_WARP";
+ Name = "WARP";
+ Colour = PIXPACK(0x101010);
+ MenuVisible = 1;
+ MenuSection = SC_NUCLEAR;
+ Enabled = 1;
+
+ Advection = 0.8f;
+ AirDrag = 0.00f * CFDS;
+ AirLoss = 0.9f;
+ Loss = 0.70f;
+ Collision = -0.1f;
+ Gravity = 0.0f;
+ Diffusion = 3.00f;
+ HotAir = 0.000f * CFDS;
+ Falldown = 0;
+
+ Flammable = 0;
+ Explosive = 0;
+ Meltable = 0;
+ Hardness = 30;
+
+ Weight = 1;
+
+ Temperature = R_TEMP +273.15f;
+ HeatConduct = 100;
+ Description = "Displaces other elements.";
+
+ State = ST_GAS;
+ Properties = TYPE_GAS|PROP_LIFE_DEC|PROP_LIFE_KILL;
+
+ LowPressure = IPL;
+ LowPressureTransition = NT;
+ HighPressure = IPH;
+ HighPressureTransition = NT;
+ LowTemperature = ITL;
+ LowTemperatureTransition = NT;
+ HighTemperature = ITH;
+ HighTemperatureTransition = NT;
+
+ Update = &Element_WARP::update;
+ Graphics = &Element_WARP::graphics;
}
//#TPT-Directive ElementHeader Element_WARP static int update(UPDATE_FUNC_ARGS)
@@ -61,7 +61,7 @@ int Element_WARP::update(UPDATE_FUNC_ARGS)
{
rx = rand()%3-1;
ry = rand()%3-1;
- 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)