summaryrefslogtreecommitdiff
path: root/src/simulation/elements
diff options
context:
space:
mode:
authorjacob1 <jfu614@gmail.com>2013-06-10 14:51:55 (GMT)
committer jacob1 <jfu614@gmail.com>2013-06-10 14:51:55 (GMT)
commitb699bb176f41012a43c42dbbf1ec82b7e1c27d3d (patch)
tree3aa231af016fd8cd654b5aaec72ec12eecdc8a17 /src/simulation/elements
parent52ec8f438b6ce3373c9258cbde402b4caef92b1e (diff)
downloadpowder-b699bb176f41012a43c42dbbf1ec82b7e1c27d3d.zip
powder-b699bb176f41012a43c42dbbf1ec82b7e1c27d3d.tar.gz
Add two new properties for CLNE-like elements
the thing CLNE does, drawing upon it will set ctype; and what BCLN does to CLNE - disables #1). Made use of the two new properties
Diffstat (limited to 'src/simulation/elements')
-rw-r--r--src/simulation/elements/BCLN.cpp2
-rw-r--r--src/simulation/elements/CLNE.cpp2
-rw-r--r--src/simulation/elements/CONV.cpp2
-rw-r--r--src/simulation/elements/FIGH.cpp2
-rw-r--r--src/simulation/elements/PBCN.cpp2
-rw-r--r--src/simulation/elements/PCLN.cpp2
-rw-r--r--src/simulation/elements/STKM.cpp2
-rw-r--r--src/simulation/elements/STKM2.cpp2
-rw-r--r--src/simulation/elements/STOR.cpp2
9 files changed, 9 insertions, 9 deletions
diff --git a/src/simulation/elements/BCLN.cpp b/src/simulation/elements/BCLN.cpp
index ecec766..2ffd078 100644
--- a/src/simulation/elements/BCLN.cpp
+++ b/src/simulation/elements/BCLN.cpp
@@ -31,7 +31,7 @@ Element_BCLN::Element_BCLN()
Description = "Breakable Clone.";
State = ST_NONE;
- Properties = TYPE_SOLID|PROP_LIFE_DEC|PROP_LIFE_KILL_DEC;
+ Properties = TYPE_SOLID|PROP_LIFE_DEC|PROP_LIFE_KILL_DEC|PROP_DRAWONCTYPE|PROP_NOCTYPEDRAW;
LowPressure = IPL;
LowPressureTransition = NT;
diff --git a/src/simulation/elements/CLNE.cpp b/src/simulation/elements/CLNE.cpp
index f0dffc2..04b0374 100644
--- a/src/simulation/elements/CLNE.cpp
+++ b/src/simulation/elements/CLNE.cpp
@@ -31,7 +31,7 @@ Element_CLNE::Element_CLNE()
Description = "Solid. Duplicates any particles it touches.";
State = ST_SOLID;
- Properties = TYPE_SOLID;
+ Properties = TYPE_SOLID|PROP_DRAWONCTYPE|PROP_NOCTYPEDRAW;
LowPressure = IPL;
LowPressureTransition = NT;
diff --git a/src/simulation/elements/CONV.cpp b/src/simulation/elements/CONV.cpp
index 59c7b1c..24baa90 100644
--- a/src/simulation/elements/CONV.cpp
+++ b/src/simulation/elements/CONV.cpp
@@ -31,7 +31,7 @@ Element_CONV::Element_CONV()
Description = "Solid. Converts everything into whatever it first touches.";
State = ST_NONE;
- Properties = TYPE_SOLID;
+ Properties = TYPE_SOLID|PROP_DRAWONCTYPE|PROP_NOCTYPEDRAW;
LowPressure = IPL;
LowPressureTransition = NT;
diff --git a/src/simulation/elements/FIGH.cpp b/src/simulation/elements/FIGH.cpp
index 6320c2d..f476671 100644
--- a/src/simulation/elements/FIGH.cpp
+++ b/src/simulation/elements/FIGH.cpp
@@ -31,7 +31,7 @@ Element_FIGH::Element_FIGH()
Description = "Fighter. Tries to kill stickmen. You must first give it an element to kill him with.";
State = ST_NONE;
- Properties = 0;
+ Properties = PROP_NOCTYPEDRAW;
LowPressure = IPL;
LowPressureTransition = NT;
diff --git a/src/simulation/elements/PBCN.cpp b/src/simulation/elements/PBCN.cpp
index ca24782..5bff0d5 100644
--- a/src/simulation/elements/PBCN.cpp
+++ b/src/simulation/elements/PBCN.cpp
@@ -31,7 +31,7 @@ Element_PBCN::Element_PBCN()
Description = "Powered breakable clone.";
State = ST_NONE;
- Properties = TYPE_SOLID;
+ Properties = TYPE_SOLID|PROP_NOCTYPEDRAW;
LowPressure = IPL;
LowPressureTransition = NT;
diff --git a/src/simulation/elements/PCLN.cpp b/src/simulation/elements/PCLN.cpp
index 441014a..26b0960 100644
--- a/src/simulation/elements/PCLN.cpp
+++ b/src/simulation/elements/PCLN.cpp
@@ -31,7 +31,7 @@ Element_PCLN::Element_PCLN()
Description = "Powered clone. When activated, duplicates any particles it touches.";
State = ST_NONE;
- Properties = TYPE_SOLID;
+ Properties = TYPE_SOLID|PROP_NOCTYPEDRAW;
LowPressure = IPL;
LowPressureTransition = NT;
diff --git a/src/simulation/elements/STKM.cpp b/src/simulation/elements/STKM.cpp
index 67d8cdf..39b389a 100644
--- a/src/simulation/elements/STKM.cpp
+++ b/src/simulation/elements/STKM.cpp
@@ -31,7 +31,7 @@ Element_STKM::Element_STKM()
Description = "Stickman. Don't kill him! Control with the arrow keys.";
State = ST_NONE;
- Properties = 0;
+ Properties = PROP_NOCTYPEDRAW;
LowPressure = IPL;
LowPressureTransition = NT;
diff --git a/src/simulation/elements/STKM2.cpp b/src/simulation/elements/STKM2.cpp
index ee94adb..d9c3d9a 100644
--- a/src/simulation/elements/STKM2.cpp
+++ b/src/simulation/elements/STKM2.cpp
@@ -31,7 +31,7 @@ Element_STKM2::Element_STKM2()
Description = "Second stickman. Don't kill him! Control with wasd.";
State = ST_NONE;
- Properties = 0;
+ Properties = PROP_NOCTYPEDRAW;
LowPressure = IPL;
LowPressureTransition = NT;
diff --git a/src/simulation/elements/STOR.cpp b/src/simulation/elements/STOR.cpp
index a09096f..ce26767 100644
--- a/src/simulation/elements/STOR.cpp
+++ b/src/simulation/elements/STOR.cpp
@@ -31,7 +31,7 @@ Element_STOR::Element_STOR()
Description = "Captures and stores a single particle. releases when charged with PSCN, also passes to PIPE.";
State = ST_NONE;
- Properties = TYPE_SOLID;
+ Properties = TYPE_SOLID|PROP_NOCTYPEDRAW;
LowPressure = IPL;
LowPressureTransition = NT;