summaryrefslogtreecommitdiff
path: root/src/main.c
diff options
context:
space:
mode:
authorPhilip <philip@philip-linuxlaptop.(none)>2010-11-06 21:13:43 (GMT)
committer Philip <philip@philip-linuxlaptop.(none)>2010-11-06 21:13:43 (GMT)
commita2c8443c369daaa693e7a820500465acd8334df9 (patch)
treee1fed014ed4cd68b71da25f5542ac17199608755 /src/main.c
parent5c91fde92e7321f9b3a56eaf90b5d288545472c3 (diff)
downloadpowder-a2c8443c369daaa693e7a820500465acd8334df9.zip
powder-a2c8443c369daaa693e7a820500465acd8334df9.tar.gz
Added high life, assimilation, and 2x2 to life particles, and put it in its own menu section.
Diffstat (limited to 'src/main.c')
-rw-r--r--src/main.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/main.c b/src/main.c
index 75e1912..bb57fc6 100644
--- a/src/main.c
+++ b/src/main.c
@@ -102,7 +102,6 @@ int death = 0, framerender = 0;
int amd = 1;
int FPSB = 0;
int MSIGN =-1;
-int NGOL = 0;
int CGOL = 0;
int GSPEED = 0;
@@ -521,8 +520,14 @@ int parse_save(void *save, int size, int replace, int x0, int y0)
{
k = pmap[y][x]>>8;
parts[k].type = j;
- if(j ==PT_GOL)
+ if(j == PT_GOL)
gol[x][y] = 1;
+ if(j == PT_HLIF)
+ gol[x][y] = 2;
+ if(j == PT_ASIM)
+ gol[x][y] = 3;
+ if(j == PT_2x2)
+ gol[x][y] = 4;
if(j == PT_PHOT)
parts[k].ctype = 0x3fffffff;
parts[k].x = (float)x;