diff options
| author | Philip <philip@philip-linuxlaptop.(none)> | 2010-11-06 01:25:02 (GMT) |
|---|---|---|
| committer | Philip <philip@philip-linuxlaptop.(none)> | 2010-11-06 01:25:02 (GMT) |
| commit | a23d46a9f6e612a51f9dfa5e0f6a578953da6757 (patch) | |
| tree | 26a1a1fd85367803b800a7f3703d1a9fc8159beb /includes | |
| parent | 068076a4aeaa444e72b44f716172e4e583953e2d (diff) | |
| download | powder-a23d46a9f6e612a51f9dfa5e0f6a578953da6757.zip powder-a23d46a9f6e612a51f9dfa5e0f6a578953da6757.tar.gz | |
GOL works 100% now. todo: make some way to set GSPEED from ingame, and is the number of frames per generation.
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/defines.h | 1 | ||||
| -rw-r--r-- | includes/powder.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/includes/defines.h b/includes/defines.h index 4e0304a..26a2f76 100644 --- a/includes/defines.h +++ b/includes/defines.h @@ -108,6 +108,7 @@ int NGOL; int CGOL; int GSPEED; int gol[XRES][YRES]; +int gol2[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 75fa728..0529161 100644 --- a/includes/powder.h +++ b/includes/powder.h @@ -285,7 +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, 9000.0f, 0, "Game Of Life!", TYPE_SOLID}, + {"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, 9000.0f, 40, "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 }; |