From 26549965993c637636e525d4f23704b50c10129e Mon Sep 17 00:00:00 2001
From: jacksonmj <jacksonmj@jacksonmj.none>
Date: Thu, 27 Jan 2011 22:38:47 +0000
Subject: Fix disappearing WTRV

If water is sparked then quickly heated past 100C, the resulting
WTRV will disappear after a few frames.

diff --git a/src/powder.c b/src/powder.c
index d595a5a..385ac5d 100644
--- a/src/powder.c
+++ b/src/powder.c
@@ -1565,6 +1565,7 @@ void update_particles_i(pixel *vid, int start, int inc)
 					}
 					else s = 0;
 					if (s) { // particle type change occurred
+						parts[i].life = 0;
 						if (t==PT_ICEI||t==PT_LAVA)
 							parts[i].ctype = parts[i].type;
 						if (ptypes[t].state==ST_GAS&&ptypes[parts[i].type].state!=ST_GAS)
@@ -1672,6 +1673,7 @@ void update_particles_i(pixel *vid, int start, int inc)
 			}
 			else s = 0;
 			if (s) { // particle type change occurred
+				parts[i].life = 0;
 				part_change_type(i,x,y,t);
 				if (t==PT_FIRE)
 					parts[i].life = rand()%50+120;
--
cgit v0.9.2-21-gd62e

From bdfbc7c409370d85f83d6cf54cff560c76bd8c09 Mon Sep 17 00:00:00 2001
From: jacksonmj <jacksonmj@jacksonmj.none>
Date: Fri, 28 Jan 2011 19:34:16 +0000
Subject: Change include file for element update functions


diff --git a/includes/element.h b/includes/element.h
new file mode 100644
index 0000000..bbd4aeb
--- /dev/null
+++ b/includes/element.h
@@ -0,0 +1,7 @@
+#ifndef ELEMENT_H
+#define ELEMENT_H
+// This header should be included by all files in src/elements/
+
+#include "powder.h"
+
+#endif
diff --git a/src/elements/acid.c b/src/elements/acid.c
index 18f3891..3d9f7b0 100644
--- a/src/elements/acid.c
+++ b/src/elements/acid.c
@@ -1,4 +1,4 @@
-#include <powder.h>
+#include <element.h>
 
 int update_ACID(UPDATE_FUNC_ARGS) {
 	int r,rx,ry;
diff --git a/src/elements/amtr.c b/src/elements/amtr.c
index 748254b..7c2126c 100644
--- a/src/elements/amtr.c
+++ b/src/elements/amtr.c
@@ -1,4 +1,4 @@
-#include <powder.h>
+#include <element.h>
 
 int update_AMTR(UPDATE_FUNC_ARGS) {
 	int r, rx, ry;
diff --git a/src/elements/aray.c b/src/elements/aray.c
index 55d6b28..f323444 100644
--- a/src/elements/aray.c
+++ b/src/elements/aray.c
@@ -1,4 +1,4 @@
-#include <powder.h>
+#include <element.h>
 
 int update_ARAY(UPDATE_FUNC_ARGS) {
 	int r, nxx, nyy, docontinue, nxi, nyi, rx, ry, nr;
diff --git a/src/elements/bcln.c b/src/elements/bcln.c
index dfcfcd8..3581fc2 100644
--- a/src/elements/bcln.c
+++ b/src/elements/bcln.c
@@ -1,4 +1,4 @@
-#include <powder.h>
+#include <element.h>
 
 int update_BCLN(UPDATE_FUNC_ARGS) {
 	if (!parts[i].life)
diff --git a/src/elements/bcol.c b/src/elements/bcol.c
index b7947bd..5be50d9 100644
--- a/src/elements/bcol.c
+++ b/src/elements/bcol.c
@@ -1,4 +1,4 @@
-#include <powder.h>
+#include <element.h>
 
 int update_BCOL(UPDATE_FUNC_ARGS) {
 	int r, rx, ry;
diff --git a/src/elements/bmtl.c b/src/elements/bmtl.c
index 5a2703e..a29ac7d 100644
--- a/src/elements/bmtl.c
+++ b/src/elements/bmtl.c
@@ -1,4 +1,4 @@
-#include <powder.h>
+#include <element.h>
 
 int update_BMTL(UPDATE_FUNC_ARGS) {
 	int r, rx, ry, rt;
diff --git a/src/elements/bomb.c b/src/elements/bomb.c
index 814f120..59e05f8 100644
--- a/src/elements/bomb.c
+++ b/src/elements/bomb.c
@@ -1,4 +1,4 @@
-#include <powder.h>
+#include <element.h>
 
 int update_BOMB(UPDATE_FUNC_ARGS) {
 	int r, rx, ry, nb;
diff --git a/src/elements/boyl.c b/src/elements/boyl.c
index bd54c6f..68e1bf6 100644
--- a/src/elements/boyl.c
+++ b/src/elements/boyl.c
@@ -1,4 +1,4 @@
-#include <powder.h>
+#include <element.h>
 
 int update_BOYL(UPDATE_FUNC_ARGS) {
 	int r, rx, ry;
diff --git a/src/elements/btry.c b/src/elements/btry.c
index a0cb651..c3a96c7 100644
--- a/src/elements/btry.c
+++ b/src/elements/btry.c
@@ -1,4 +1,4 @@
-#include <powder.h>
+#include <element.h>
 
 int update_BTRY(UPDATE_FUNC_ARGS) {
 	int r, rx, ry, rt;
diff --git a/src/elements/c5.c b/src/elements/c5.c
index ff51be3..000c2be 100644
--- a/src/elements/c5.c
+++ b/src/elements/c5.c
@@ -1,4 +1,4 @@
-#include <powder.h>
+#include <element.h>
 
 int update_C5(UPDATE_FUNC_ARGS) {
 	int r, rx, ry;
diff --git a/src/elements/clne.c b/src/elements/clne.c
index dcb205b..173bd0a 100644
--- a/src/elements/clne.c
+++ b/src/elements/clne.c
@@ -1,4 +1,4 @@
-#include <powder.h>
+#include <element.h>
 
 int update_CLNE(UPDATE_FUNC_ARGS) {
 	if (!parts[i].ctype)
diff --git a/src/elements/coal.c b/src/elements/coal.c
index 8793eb4..3cc68e3 100644
--- a/src/elements/coal.c
+++ b/src/elements/coal.c
@@ -1,4 +1,4 @@
-#include <powder.h>
+#include <element.h>
 
 int update_COAL(UPDATE_FUNC_ARGS) {
 	int r, rx, ry;
diff --git a/src/elements/deut.c b/src/elements/deut.c
index 640d84a..2d7a1f2 100644
--- a/src/elements/deut.c
+++ b/src/elements/deut.c
@@ -1,4 +1,4 @@
-#include <powder.h>
+#include <element.h>
 
 int update_DEUT(UPDATE_FUNC_ARGS) {
 	int r, rx, ry, trade, np;
diff --git a/src/elements/dstw.c b/src/elements/dstw.c
index ae6db18..7ce6c09 100644
--- a/src/elements/dstw.c
+++ b/src/elements/dstw.c
@@ -1,4 +1,4 @@
-#include <powder.h>
+#include <element.h>
 
 int update_DSTW(UPDATE_FUNC_ARGS) {
 	int r, rx, ry;
diff --git a/src/elements/firw.c b/src/elements/firw.c
index e8e1c4a..ae1f56d 100644
--- a/src/elements/firw.c
+++ b/src/elements/firw.c
@@ -1,4 +1,4 @@
-#include <powder.h>
+#include <element.h>
 
 int update_FIRW(UPDATE_FUNC_ARGS) {
 	int r, rx, ry, rt;
diff --git a/src/elements/fog.c b/src/elements/fog.c
index 17d4c73..ff13916 100644
--- a/src/elements/fog.c
+++ b/src/elements/fog.c
@@ -1,4 +1,4 @@
-#include <powder.h>
+#include <element.h>
 
 int update_FOG(UPDATE_FUNC_ARGS) {
 	int r, rx, ry;
diff --git a/src/elements/frzw.c b/src/elements/frzw.c
index ac7170d..3135357 100644
--- a/src/elements/frzw.c
+++ b/src/elements/frzw.c
@@ -1,4 +1,4 @@
-#include <powder.h>
+#include <element.h>
 
 int update_FRZW(UPDATE_FUNC_ARGS) {
 	int r, rx, ry;
diff --git a/src/elements/frzz.c b/src/elements/frzz.c
index 0872397..f995d5f 100644
--- a/src/elements/frzz.c
+++ b/src/elements/frzz.c
@@ -1,4 +1,4 @@
-#include <powder.h>
+#include <element.h>
 
 int update_FRZZ(UPDATE_FUNC_ARGS) {
 	int r, rx, ry;
diff --git a/src/elements/fsep.c b/src/elements/fsep.c
index 0149b15..6b3b376 100644
--- a/src/elements/fsep.c
+++ b/src/elements/fsep.c
@@ -1,4 +1,4 @@
-#include <powder.h>
+#include <element.h>
 
 int update_FSEP(UPDATE_FUNC_ARGS) {
 	int r, rx, ry;
diff --git a/src/elements/fuse.c b/src/elements/fuse.c
index 1b6e8bf..ad0a413 100644
--- a/src/elements/fuse.c
+++ b/src/elements/fuse.c
@@ -1,4 +1,4 @@
-#include <powder.h>
+#include <element.h>
 
 int update_FUSE(UPDATE_FUNC_ARGS) {
 	int r, rx, ry;
diff --git a/src/elements/fwrk.c b/src/elements/fwrk.c
index f74990d..def28e4 100644
--- a/src/elements/fwrk.c
+++ b/src/elements/fwrk.c
@@ -1,4 +1,4 @@
-#include <powder.h>
+#include <element.h>
 
 int update_FWRK(UPDATE_FUNC_ARGS) {
 	int r, rx, ry, np;
diff --git a/src/elements/glas.c b/src/elements/glas.c
index ed6df85..bc2d5ce 100644
--- a/src/elements/glas.c
+++ b/src/elements/glas.c
@@ -1,4 +1,4 @@
-#include <powder.h>
+#include <element.h>
 
 int update_GLAS(UPDATE_FUNC_ARGS) {
 	parts[i].pavg[0] = parts[i].pavg[1];
diff --git a/src/elements/glow.c b/src/elements/glow.c
index aa4d2b0..621e5b1 100644
--- a/src/elements/glow.c
+++ b/src/elements/glow.c
@@ -1,4 +1,4 @@
-#include <powder.h>
+#include <element.h>
 
 int update_GLOW(UPDATE_FUNC_ARGS) {
 	int r, rx, ry;
diff --git a/src/elements/goo.c b/src/elements/goo.c
index 7ae529b..0818173 100644
--- a/src/elements/goo.c
+++ b/src/elements/goo.c
@@ -1,4 +1,4 @@
-#include <powder.h>
+#include <element.h>
 
 int update_GOO(UPDATE_FUNC_ARGS) {
 	if (!parts[i].life)
diff --git a/src/elements/hswc.c b/src/elements/hswc.c
index bfb7238..5470e2d 100644
--- a/src/elements/hswc.c
+++ b/src/elements/hswc.c
@@ -1,4 +1,4 @@
-#include <powder.h>
+#include <element.h>
 
 int update_HSWC(UPDATE_FUNC_ARGS) {
 	int r, rx, ry;
diff --git a/src/elements/ice.c b/src/elements/ice.c
index e361fa6..5b792ce 100644
--- a/src/elements/ice.c
+++ b/src/elements/ice.c
@@ -1,4 +1,4 @@
-#include <powder.h>
+#include <element.h>
 
 int update_ICEI(UPDATE_FUNC_ARGS) { //currently used for snow as well
 	int r, rx, ry;
diff --git a/src/elements/iron.c b/src/elements/iron.c
index dc39634..0be1e1f 100644
--- a/src/elements/iron.c
+++ b/src/elements/iron.c
@@ -1,4 +1,4 @@
-#include <powder.h>
+#include <element.h>
 
 int update_IRON(UPDATE_FUNC_ARGS) {
 	int r, rx, ry;
diff --git a/src/elements/isz.c b/src/elements/isz.c
index 5bb465a..348b78d 100644
--- a/src/elements/isz.c
+++ b/src/elements/isz.c
@@ -1,4 +1,4 @@
-#include <powder.h>
+#include <element.h>
 
 int update_ISZ(UPDATE_FUNC_ARGS) { // for both ISZS and ISOZ
 	float rr, rrr;
diff --git a/src/elements/lcry.c b/src/elements/lcry.c
index 5f888a9..a6d442f 100644
--- a/src/elements/lcry.c
+++ b/src/elements/lcry.c
@@ -1,4 +1,4 @@
-#include <powder.h>
+#include <element.h>
 
 int update_LCRY(UPDATE_FUNC_ARGS) {
 	if (parts[i].life==10)
diff --git a/src/elements/legacy.c b/src/elements/legacy.c
index c8fce73..1a345dd 100644
--- a/src/elements/legacy.c
+++ b/src/elements/legacy.c
@@ -1,4 +1,4 @@
-#include <powder.h>
+#include <element.h>
 
 // Interactions which only occur when legacy_enable is on
 int update_legacy_all(UPDATE_FUNC_ARGS) {
diff --git a/src/elements/misc.c b/src/elements/misc.c
index 67309c6..a284b3a 100644
--- a/src/elements/misc.c
+++ b/src/elements/misc.c
@@ -1,4 +1,4 @@
-#include <powder.h>
+#include <element.h>
 
 int update_MISC(UPDATE_FUNC_ARGS) {
 	int t = parts[i].type;
diff --git a/src/elements/mort.c b/src/elements/mort.c
index 609eafd..d215abc 100644
--- a/src/elements/mort.c
+++ b/src/elements/mort.c
@@ -1,4 +1,4 @@
-#include <powder.h>
+#include <element.h>
 
 int update_MORT(UPDATE_FUNC_ARGS) {
 	create_part(-1, x, y-1, PT_SMKE);
diff --git a/src/elements/neut.c b/src/elements/neut.c
index 42ee9d3..aa3ddf0 100644
--- a/src/elements/neut.c
+++ b/src/elements/neut.c
@@ -1,4 +1,4 @@
-#include <powder.h>
+#include <element.h>
 
 int update_NEUT(UPDATE_FUNC_ARGS) {
 	int r, rx, ry;
diff --git a/src/elements/none.c b/src/elements/none.c
index 7e38fd0..7049811 100644
--- a/src/elements/none.c
+++ b/src/elements/none.c
@@ -1,4 +1,4 @@
-#include <powder.h>
+#include <element.h>
 
 int update_(UPDATE_FUNC_ARGS) {
 
diff --git a/src/elements/nptct.c b/src/elements/nptct.c
index 116294f..95d4d9a 100644
--- a/src/elements/nptct.c
+++ b/src/elements/nptct.c
@@ -1,4 +1,4 @@
-#include <powder.h>
+#include <element.h>
 
 int update_NPTCT(UPDATE_FUNC_ARGS) {
 	if (parts[i].temp>295.0f)
diff --git a/src/elements/pcln.c b/src/elements/pcln.c
index 45edd1e..00e5db0 100644
--- a/src/elements/pcln.c
+++ b/src/elements/pcln.c
@@ -1,4 +1,4 @@
-#include <powder.h>
+#include <element.h>
 
 int update_PCLN(UPDATE_FUNC_ARGS) {
 	int r, rx, ry;
diff --git a/src/elements/phot.c b/src/elements/phot.c
index 95f427f..7b7afc6 100644
--- a/src/elements/phot.c
+++ b/src/elements/phot.c
@@ -1,4 +1,4 @@
-#include <powder.h>
+#include <element.h>
 
 int update_PHOT(UPDATE_FUNC_ARGS) {
 	if (1>rand()%10) update_PYRO(UPDATE_FUNC_SUBCALL_ARGS);
diff --git a/src/elements/pipe.c b/src/elements/pipe.c
index 4bd1799..7d709aa 100644
--- a/src/elements/pipe.c
+++ b/src/elements/pipe.c
@@ -1,4 +1,4 @@
-#include <powder.h>
+#include <element.h>
 
 int update_PIPE(UPDATE_FUNC_ARGS) {
 	int r, rx, ry, np, trade, q, ctype;
diff --git a/src/elements/plnt.c b/src/elements/plnt.c
index 79c9d8a..2ca38dd 100644
--- a/src/elements/plnt.c
+++ b/src/elements/plnt.c
@@ -1,4 +1,4 @@
-#include <powder.h>
+#include <element.h>
 
 int update_PLNT(UPDATE_FUNC_ARGS) {
 	int r, rx, ry, np;
diff --git a/src/elements/plut.c b/src/elements/plut.c
index 738e29d..cbc9b7b 100644
--- a/src/elements/plut.c
+++ b/src/elements/plut.c
@@ -1,4 +1,4 @@
-#include <powder.h>
+#include <element.h>
 
 int update_PLUT(UPDATE_FUNC_ARGS) {
 	if (1>rand()%100 && ((int)(5.0f*pv[y/CELL][x/CELL]))>(rand()%1000))
diff --git a/src/elements/prti.c b/src/elements/prti.c
index 4310f86..b25f7a3 100644
--- a/src/elements/prti.c
+++ b/src/elements/prti.c
@@ -1,4 +1,4 @@
-#include <powder.h>
+#include <element.h>
 
 int update_PRTI(UPDATE_FUNC_ARGS) {
 	int r, nnx, rx, ry;
diff --git a/src/elements/prto.c b/src/elements/prto.c
index 4889e89..2da6e00 100644
--- a/src/elements/prto.c
+++ b/src/elements/prto.c
@@ -1,4 +1,4 @@
-#include <powder.h>
+#include <element.h>
 
 int update_PRTO(UPDATE_FUNC_ARGS) {
 	int r, nnx, rx, ry, np;
diff --git a/src/elements/pump.c b/src/elements/pump.c
index c1c1201..244ca8f 100644
--- a/src/elements/pump.c
+++ b/src/elements/pump.c
@@ -1,4 +1,4 @@
-#include <powder.h>
+#include <element.h>
 
 int update_PUMP(UPDATE_FUNC_ARGS) {
 	int r, rx, ry;
diff --git a/src/elements/pyro.c b/src/elements/pyro.c
index ba82168..0fe1def 100644
--- a/src/elements/pyro.c
+++ b/src/elements/pyro.c
@@ -1,4 +1,4 @@
-#include <powder.h>
+#include <element.h>
 
 int update_PYRO(UPDATE_FUNC_ARGS) {
 	int r, rx, ry, rt, t = parts[i].type;
diff --git a/src/elements/qrtz.c b/src/elements/qrtz.c
index 2fb97b0..74d8c99 100644
--- a/src/elements/qrtz.c
+++ b/src/elements/qrtz.c
@@ -1,4 +1,4 @@
-#include <powder.h>
+#include <element.h>
 
 int update_QRTZ(UPDATE_FUNC_ARGS) {
 	parts[i].pavg[0] = parts[i].pavg[1];
diff --git a/src/elements/rime.c b/src/elements/rime.c
index 845d8a2..e0337e5 100644
--- a/src/elements/rime.c
+++ b/src/elements/rime.c
@@ -1,4 +1,4 @@
-#include <powder.h>
+#include <element.h>
 
 int update_RIME(UPDATE_FUNC_ARGS) {
 	int r, rx, ry;
diff --git a/src/elements/shld.c b/src/elements/shld.c
index 434a9db..81b9f1b 100644
--- a/src/elements/shld.c
+++ b/src/elements/shld.c
@@ -1,4 +1,4 @@
-#include <powder.h>
+#include <element.h>
 
 int update_SHLD1(UPDATE_FUNC_ARGS) {
 	int r, nnx, nny, rx, ry;
diff --git a/src/elements/sing.c b/src/elements/sing.c
index 7127f77..02f5eaf 100644
--- a/src/elements/sing.c
+++ b/src/elements/sing.c
@@ -1,4 +1,4 @@
-#include <powder.h>
+#include <element.h>
 
 int update_SING(UPDATE_FUNC_ARGS) {
 	int r, rx, ry;
diff --git a/src/elements/sltw.c b/src/elements/sltw.c
index 7f23f1c..b6d18bb 100644
--- a/src/elements/sltw.c
+++ b/src/elements/sltw.c
@@ -1,4 +1,4 @@
-#include <powder.h>
+#include <element.h>
 
 int update_SLTW(UPDATE_FUNC_ARGS) {
 	int r, rx, ry;
diff --git a/src/elements/spng.c b/src/elements/spng.c
index d8eb1f1..5bc7e95 100644
--- a/src/elements/spng.c
+++ b/src/elements/spng.c
@@ -1,4 +1,4 @@
-#include <powder.h>
+#include <element.h>
 
 int update_SPNG(UPDATE_FUNC_ARGS) {
 	int r, trade, rx, ry, tmp;
diff --git a/src/elements/sprk.c b/src/elements/sprk.c
index 891be3a..0f3c6c7 100644
--- a/src/elements/sprk.c
+++ b/src/elements/sprk.c
@@ -1,4 +1,4 @@
-#include <powder.h>
+#include <element.h>
 
 int update_SPRK(UPDATE_FUNC_ARGS) {
 	update_PYRO(UPDATE_FUNC_SUBCALL_ARGS);
diff --git a/src/elements/stkm.c b/src/elements/stkm.c
index 9576ae3..6d6b4ab 100644
--- a/src/elements/stkm.c
+++ b/src/elements/stkm.c
@@ -1,4 +1,4 @@
-#include <powder.h>
+#include <element.h>
 
 int update_SPAWN(UPDATE_FUNC_ARGS) {
 	ISSPAWN1 = 1;
diff --git a/src/elements/stkm2.c b/src/elements/stkm2.c
index 805cb73..319e388 100644
--- a/src/elements/stkm2.c
+++ b/src/elements/stkm2.c
@@ -1,4 +1,4 @@
-#include <powder.h>
+#include <element.h>
 
 int update_SPAWN2(UPDATE_FUNC_ARGS) {
 	ISSPAWN2 = 1;
diff --git a/src/elements/swch.c b/src/elements/swch.c
index 8a8e989..043bf23 100644
--- a/src/elements/swch.c
+++ b/src/elements/swch.c
@@ -1,4 +1,4 @@
-#include <powder.h>
+#include <element.h>
 
 int update_SWCH(UPDATE_FUNC_ARGS) {
 	int r, rt, rx, ry;
diff --git a/src/elements/thdr.c b/src/elements/thdr.c
index 0f25ccd..fb90d1d 100644
--- a/src/elements/thdr.c
+++ b/src/elements/thdr.c
@@ -1,4 +1,4 @@
-#include <powder.h>
+#include <element.h>
 
 int update_THDR(UPDATE_FUNC_ARGS) {
 	int r, rx, ry;
diff --git a/src/elements/thrm.c b/src/elements/thrm.c
index 3529c2e..838b466 100644
--- a/src/elements/thrm.c
+++ b/src/elements/thrm.c
@@ -1,4 +1,4 @@
-#include <powder.h>
+#include <element.h>
 
 int update_THRM(UPDATE_FUNC_ARGS) {
 	int r, rx, ry;
diff --git a/src/elements/uran.c b/src/elements/uran.c
index ecf89cc..2b6c563 100644
--- a/src/elements/uran.c
+++ b/src/elements/uran.c
@@ -1,4 +1,4 @@
-#include <powder.h>
+#include <element.h>
 
 int update_URAN(UPDATE_FUNC_ARGS) {
 	if (!legacy_enable && pv[y/CELL][x/CELL]>0.0f)
diff --git a/src/elements/vine.c b/src/elements/vine.c
index a5d932a..28b97d5 100644
--- a/src/elements/vine.c
+++ b/src/elements/vine.c
@@ -1,4 +1,4 @@
-#include <powder.h>
+#include <element.h>
 
 int update_VINE(UPDATE_FUNC_ARGS) {
 	int r, np, rx =(rand()%3)-1, ry=(rand()%3)-1;
diff --git a/src/elements/warp.c b/src/elements/warp.c
index d0fe62c..755433f 100644
--- a/src/elements/warp.c
+++ b/src/elements/warp.c
@@ -1,4 +1,4 @@
-#include <powder.h>
+#include <element.h>
 
 int update_WARP(UPDATE_FUNC_ARGS) {
 	int trade, r, rx, ry;
diff --git a/src/elements/watr.c b/src/elements/watr.c
index 8f1df18..7c7ef64 100644
--- a/src/elements/watr.c
+++ b/src/elements/watr.c
@@ -1,4 +1,4 @@
-#include <powder.h>
+#include <element.h>
 
 int update_WATR(UPDATE_FUNC_ARGS) {
 	int r, rx, ry;
diff --git a/src/elements/wifi.c b/src/elements/wifi.c
index a6b9ab0..fc5ee7f 100644
--- a/src/elements/wifi.c
+++ b/src/elements/wifi.c
@@ -1,4 +1,4 @@
-#include <powder.h>
+#include <element.h>
 
 int update_WIFI(UPDATE_FUNC_ARGS) {
 	int r, rx, ry;
diff --git a/src/elements/wtrv.c b/src/elements/wtrv.c
index 45ffb30..7a32c94 100644
--- a/src/elements/wtrv.c
+++ b/src/elements/wtrv.c
@@ -1,4 +1,4 @@
-#include <powder.h>
+#include <element.h>
 
 int update_WTRV(UPDATE_FUNC_ARGS) {
 	int r, rx, ry;
diff --git a/src/elements/yest.c b/src/elements/yest.c
index d3ee0fe..d3f64cd 100644
--- a/src/elements/yest.c
+++ b/src/elements/yest.c
@@ -1,4 +1,4 @@
-#include <powder.h>
+#include <element.h>
 
 int update_YEST(UPDATE_FUNC_ARGS) {
 	int r, rx, ry;
--
cgit v0.9.2-21-gd62e

From 086e3151ad968b9c81f1b3b4391e5f9c42a1189c Mon Sep 17 00:00:00 2001
From: jacksonmj <jacksonmj@jacksonmj.none>
Date: Fri, 28 Jan 2011 19:41:00 +0000
Subject: Fix some problems with restrict_flt

This change fixes pressure glitches, burning substances cooling by themselves to absolute
zero, and SING having temperatures of minus several million Kelvin.

diff --git a/includes/element.h b/includes/element.h
index bbd4aeb..ec32df2 100644
--- a/includes/element.h
+++ b/includes/element.h
@@ -3,5 +3,6 @@
 // This header should be included by all files in src/elements/
 
 #include "powder.h"
+#include "misc.h"
 
 #endif
--
cgit v0.9.2-21-gd62e