summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPhilip <philip@philip-linuxlaptop.(none)>2010-11-07 18:34:09 (GMT)
committer Philip <philip@philip-linuxlaptop.(none)>2010-11-07 18:34:09 (GMT)
commitcbe3ed49c4604864ef41e6d8e629b25259eb491e (patch)
treef0a153f764807d74392e17bd207db77c43ae032b /src
parentea1c44aba4c9150b082cfdd57187022cc58879b7 (diff)
downloadpowder-cbe3ed49c4604864ef41e6d8e629b25259eb491e.zip
powder-cbe3ed49c4604864ef41e6d8e629b25259eb491e.tar.gz
Removed old fix, not needed. And fixed loading of other saves with GoL particles on screen
Diffstat (limited to 'src')
-rw-r--r--src/main.c19
1 files changed, 1 insertions, 18 deletions
diff --git a/src/main.c b/src/main.c
index 9db78db..ee20b8d 100644
--- a/src/main.c
+++ b/src/main.c
@@ -514,30 +514,13 @@ int parse_save(void *save, int size, int replace, int x0, int y0)
//TODO: Possibly some server side translation
j = PT_DUST;//goto corrupt;
}
+ gol[x][y]=0;
if(j)// && !(isplayer == 1 && j==PT_STKM))
{
if(pmap[y][x])
{
k = pmap[y][x]>>8;
parts[k].type = j;
- 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_DANI)
- gol[x][y] = 5;
- if(j == PT_AMOE)
- gol[x][y] = 6;
- if(j == PT_MOVE)
- gol[x][y] = 7;
- if(j == PT_PGOL)
- gol[x][y] = 8;
- if(j == PT_DMOE)
- gol[x][y] = 9;
if(j == PT_PHOT)
parts[k].ctype = 0x3fffffff;
parts[k].x = (float)x;