summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2012-02-25 10:26:02 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2012-02-25 10:26:02 (GMT)
commitf6696282e1d06081bb8b9d7a394483562b9f2165 (patch)
treee79cb452dc15bb2264cd1044ba56e9f916e4305e /includes
parent1c4bce1f22d67c25b9bf7ec92dbef37628885f1e (diff)
downloadpowder-f6696282e1d06081bb8b9d7a394483562b9f2165.zip
powder-f6696282e1d06081bb8b9d7a394483562b9f2165.tar.gz
Added FRAY - Force-ray and RPEL - Repeller
Diffstat (limited to 'includes')
-rw-r--r--includes/interface.h23
-rw-r--r--includes/powder.h6
2 files changed, 18 insertions, 11 deletions
diff --git a/includes/interface.h b/includes/interface.h
index 27ba33f..34c65a6 100644
--- a/includes/interface.h
+++ b/includes/interface.h
@@ -36,24 +36,27 @@ typedef struct menu_wall menu_wall;
#define SC_WALL 0
#define SC_ELEC 1
#define SC_POWERED 2
-#define SC_EXPLOSIVE 3
-#define SC_GAS 4
-#define SC_LIQUID 5
-#define SC_POWDERS 6
-#define SC_SOLIDS 7
-#define SC_NUCLEAR 8
-#define SC_SPECIAL 9
-#define SC_LIFE 10
-#define SC_TOOL 11
+#define SC_FORCE 3
+#define SC_EXPLOSIVE 4
+#define SC_GAS 5
+#define SC_LIQUID 6
+#define SC_POWDERS 7
+#define SC_SOLIDS 8
+#define SC_NUCLEAR 9
+#define SC_SPECIAL 10
+#define SC_LIFE 11
+#define SC_TOOL 12
+
#define SC_CRACKER 13
#define SC_CRACKER2 14
-#define SC_TOTAL 12
+#define SC_TOTAL 13
static menu_section msections[] = //doshow does not do anything currently.
{
{"\xC1", "Walls", 0, 1},
{"\xC2", "Electronics", 0, 1},
{"\xD6", "Powered Materials", 0, 1},
+ {">", "Force", 0, 1},
{"\xC3", "Explosives", 0, 1},
{"\xC5", "Gasses", 0, 1},
{"\xC4", "Liquids", 0, 1},
diff --git a/includes/powder.h b/includes/powder.h
index 3330bb3..2dc5692 100644
--- a/includes/powder.h
+++ b/includes/powder.h
@@ -214,7 +214,9 @@
#define PT_WIRE 156
#define PT_GBMB 157
#define PT_FIGH 158
-#define PT_NUM 159
+#define PT_FRAY 159
+#define PT_REPL 160
+#define PT_NUM 161
#define R_TEMP 22
#define MAX_TEMP 9999
@@ -432,6 +434,8 @@ int update_ACEL(UPDATE_FUNC_ARGS);
int update_DCEL(UPDATE_FUNC_ARGS);
int update_BANG(UPDATE_FUNC_ARGS);
int update_IGNT(UPDATE_FUNC_ARGS);
+int update_FRAY(UPDATE_FUNC_ARGS);
+int update_REPL(UPDATE_FUNC_ARGS);
int update_MISC(UPDATE_FUNC_ARGS);
int update_legacy_PYRO(UPDATE_FUNC_ARGS);