matthew/The-Powder-Toy
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Damn it git, WHAT ARE YOU DOING?

Browse Source
This commit is contained in:
Simon 2011-01-05 20:05:40 +00:00
parent 71c5d53f7f
commit e2d4ae5763
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/powder.c
View File

@ -585,22 +585,17 @@ inline int create_part(int p, int x, int y, int t)
{ {
if(((pmap[y][x]&0xFF)==PT_CLNE||(pmap[y][x]&0xFF)==PT_BCLN||(pmap[y][x]&0xFF)==PT_PCLN)&&(t!=PT_CLNE&&t!=PT_PCLN&&t!=PT_BCLN&&t!=PT_STKM&&t!=PT_STKM2)) if(((pmap[y][x]&0xFF)==PT_CLNE||(pmap[y][x]&0xFF)==PT_BCLN||(pmap[y][x]&0xFF)==PT_PCLN)&&(t!=PT_CLNE&&t!=PT_PCLN&&t!=PT_BCLN&&t!=PT_STKM&&t!=PT_STKM2))
{ {
if(((pmap[y][x]&0xFF)==PT_CLNE||(pmap[y][x]&0xFF)==PT_BCLN||(pmap[y][x]&0xFF)==PT_PCLN)&&(t!=PT_CLNE&&t!=PT_PCLN&&t!=PT_BCLN)) parts[pmap[y][x]>>8].ctype = t;
{
parts[pmap[y][x]>>8].ctype = t;
}
return -1;
} }
if(pfree == -1) return -1;
return -1;
i = pfree;
pfree = parts[i].life;
} }
else if(pfree == -1)
{ return -1;
i = p; i = pfree;
} pfree = parts[i].life;
} }
else
i = p;
if(t==PT_GLAS) if(t==PT_GLAS)
{ {
@ -696,7 +691,7 @@ inline int create_part(int p, int x, int y, int t)
} }
if(t==PT_BIZR||t==PT_BIZRG) if(t==PT_BIZR||t==PT_BIZRG)
parts[i].ctype = 0x47FFFF; parts[i].ctype = 0x47FFFF;
if(t!=PT_STKM&&t!=PT_STKM2)// && t!=PT_PHOT && t!=PT_NEUT) is this needed? it breaks floodfill if(t!=PT_STKM&&t!=PT_STKM2 && t!=PT_PHOT)// && t!=PT_NEUT) is this needed? it breaks floodfill, Yes photons should not be placed in the PMAP
pmap[y][x] = t|(i<<8); pmap[y][x] = t|(i<<8);
else if(t==PT_STKM) else if(t==PT_STKM)
{ {