summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPhilip <philip@philip-linuxlaptop.(none)>2010-11-09 06:04:59 (GMT)
committer Philip <philip@philip-linuxlaptop.(none)>2010-11-09 06:04:59 (GMT)
commitfebd9be62764a0b08c6c2501a87d073591343000 (patch)
tree8aca73a7742552e9db25a72e211e5ccae399405d /src
parent16265e3736d5cf9e5620d423e03ed1df0ede50eb (diff)
downloadpowder-febd9be62764a0b08c6c2501a87d073591343000.zip
powder-febd9be62764a0b08c6c2501a87d073591343000.tar.gz
Added 3 more life types
Diffstat (limited to 'src')
-rw-r--r--src/main.c4
-rw-r--r--src/powder.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/main.c b/src/main.c
index e7f2cd1..63431b4 100644
--- a/src/main.c
+++ b/src/main.c
@@ -102,8 +102,8 @@ int death = 0, framerender = 0;
int amd = 1;
int FPSB = 0;
int MSIGN =-1;
-int CGOL = 0;
-int GSPEED = 1;
+//int CGOL = 0;
+//int GSPEED = 1;
sign signs[MAXSIGNS];
diff --git a/src/powder.c b/src/powder.c
index 1c63255..b845094 100644
--- a/src/powder.c
+++ b/src/powder.c
@@ -824,7 +824,7 @@ void update_particles_i(pixel *vid, int start, int inc)
int starti = (start*-1);
if(sys_pause&&!framerender)
return;
- if(ISGOL==1&&CGOL>=GSPEED)//GSPEED is frames per generation
+ if(ISGOL==1&&CGOL>=1)//GSPEED is frames per generation
{
for(nx=4;nx<XRES-4;nx++)
for(ny=4;ny<YRES-4;ny++)
@@ -1874,7 +1874,7 @@ void update_particles_i(pixel *vid, int start, int inc)
else if(t==PT_MORT) {
create_part(-1, x, y-1, PT_SMKE);
}
- else if(t==PT_GOL||t==PT_HLIF||t==PT_ASIM||t==PT_2x2||t==PT_DANI||t==PT_AMOE||t==PT_MOVE||t==PT_PGOL||t==PT_DMOE)
+ else if(t==PT_GOL||t==PT_HLIF||t==PT_ASIM||t==PT_2x2||t==PT_DANI||t==PT_AMOE||t==PT_MOVE||t==PT_PGOL||t==PT_DMOE||t==PT_34||t==PT_LLIF||t==PT_STAN)
{
if(parts[i].temp>0)
parts[i].temp -= 50.0f;