summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorPhilip <philip@philip-linuxlaptop.(none)>2010-11-05 02:12:51 (GMT)
committer Philip <philip@philip-linuxlaptop.(none)>2010-11-05 02:12:51 (GMT)
commit4ed5b47bfffd20c887e422a3997a756cc0066866 (patch)
treef9e5b765aa4dd8b2630f2fc35b94b5d2c1094db0 /includes
parent443a861eaf59819fef9ba17033106057b17ea4df (diff)
downloadpowder-4ed5b47bfffd20c887e422a3997a756cc0066866.zip
powder-4ed5b47bfffd20c887e422a3997a756cc0066866.tar.gz
LOL GOL WORKS
Diffstat (limited to 'includes')
-rw-r--r--includes/defines.h3
-rw-r--r--includes/powder.h4
2 files changed, 6 insertions, 1 deletions
diff --git a/includes/defines.h b/includes/defines.h
index df1fa0a..1827eca 100644
--- a/includes/defines.h
+++ b/includes/defines.h
@@ -104,6 +104,9 @@ struct stamp
typedef struct stamp stamp;
int MSIGN;
+int NGOL;
+int CGOL;
+int gol[XRES][YRES];
extern sign signs[MAXSIGNS];
extern stamp stamps[STAMP_MAX];
extern int stamp_count;
diff --git a/includes/powder.h b/includes/powder.h
index fbf79fc..10758a0 100644
--- a/includes/powder.h
+++ b/includes/powder.h
@@ -116,7 +116,8 @@
#define PT_HSWC 75
#define PT_IRON 76
#define PT_MORT 77
-#define PT_NUM 78
+#define PT_GOL 78
+#define PT_NUM 79
#define R_TEMP 22
#define MAX_TEMP 9999
@@ -284,6 +285,7 @@ static const part_type ptypes[PT_NUM] =
{"HSWC", PIXPACK(0x3B1010), 0.0f, 0.00f * CFDS, 0.90f, 0.00f, 0.0f, 0.0f, 0.00f, 0.000f * CFDS, 0, 0, 0, 1, 1, 1, 100, SC_ELEC, R_TEMP+0.0f +273.15f, 251, "Heat switch. Conducts Heat only when activated", TYPE_SOLID},
{"IRON", PIXPACK(0x707070), 0.0f, 0.00f * CFDS, 0.90f, 0.00f, 0.0f, 0.0f, 0.00f, 0.000f * CFDS, 0, 0, 0, 1, 50, 0, 100, SC_SOLIDS, R_TEMP+0.0f +273.15f, 251, "Rusts with salt, can be used for electrlosis of WATR", TYPE_SOLID},
{"MORT", PIXPACK(0xE0E0E0), 0.0f, 0.00f * CFDS, 1.00f, 1.00f, -0.99f, 0.0f, 0.01f, 0.002f * CFDS, 0, 0, 0, 0, 0, 0, -1, SC_NUCLEAR, R_TEMP+4.0f +273.15f, 60, "Steam Train.", TYPE_PART},
+ {"GOL", PIXPACK(0x0CAC00), 0.0f, 0.00f * CFDS, 0.90f, 0.00f, 0.0f, 0.0f, 0.00f, 0.000f * CFDS, 0, 0, 0, 0, 0, 1, 100, SC_SPECIAL, R_TEMP+0.0f +273.15f, 0, "Game Of Life!", TYPE_SOLID},
//Name Colour Advec Airdrag Airloss Loss Collid Grav Diffus Hotair Fal Burn Exp Mel Hrd M Weights Section H Ins(real world, by triclops200) Description
};