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

Revert PCLN switching to original version.

Browse Source 
For compatibility with some saves relying on the exact time
taken for a switch on/off to spread through adjacent PCLN dots.
This commit is contained in:
jacksonmj 2011-01-08 11:17:44 +00:00
parent f53826b150
commit 692e2ba86d
2 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/elements/pcln.c
View File

@ -2,25 +2,29 @@
int update_PCLN(UPDATE_FUNC_ARGS) { int update_PCLN(UPDATE_FUNC_ARGS) {
int r; int r;
if (parts[i].life==10) for (nx=-2; nx<3; nx++)
{ for (ny=-2; ny<3; ny++)
for (nx=-2; nx<3; nx++) if (x+nx>=0 && y+ny>0 &&
for (ny=-2; ny<3; ny++) x+nx<XRES && y+ny<YRES && (nx || ny))
if (x+nx>=0 && y+ny>0 && {
x+nx<XRES && y+ny<YRES && (nx || ny)) r = pmap[y+ny][x+nx];
if ((r>>8)>=NPART || !r)
continue;
if ((r&0xFF)==PT_SPRK)
{ {
r = pmap[y+ny][x+nx]; if (parts[r>>8].ctype==PT_PSCN)
if ((r>>8)>=NPART || !r) parts[i].life = 10;
continue; else if (parts[r>>8].ctype==PT_NSCN)
if ((r&0xFF)==PT_PCLN) parts[i].life = 9;
{
if (parts[r>>8].life<10&&parts[r>>8].life>0)
parts[i].life = 9;
else if (parts[r>>8].life==0)
parts[r>>8].life = 10;
}
} }
} if ((r&0xFF)==PT_PCLN)
{
if (parts[i].life==10&&parts[r>>8].life<10&&parts[r>>8].life>0)
parts[i].life = 9;
else if (parts[i].life==0&&parts[r>>8].life==10)
parts[i].life = 10;
}
}
if (!parts[i].ctype) if (!parts[i].ctype)
for (nx=-1; nx<2; nx++) for (nx=-1; nx<2; nx++)
for (ny=-1; ny<2; ny++) for (ny=-1; ny<2; ny++)

2
src/elements/sprk.c
View File

@ -87,7 +87,7 @@ int update_SPRK(UPDATE_FUNC_ARGS) {
parts[r>>8].life = 9; parts[r>>8].life = 9;
} }
} }
else if ((ct==PT_PSCN||ct==PT_NSCN) && (rt==PT_PUMP||rt==PT_HSWC||rt==PT_PCLN||(rt==PT_LCRY&&abs(nx)<2&&abs(ny)<2))) else if ((ct==PT_PSCN||ct==PT_NSCN) && (rt==PT_PUMP||rt==PT_HSWC||(rt==PT_LCRY&&abs(nx)<2&&abs(ny)<2)))
{ {
if (ct==PT_PSCN) parts[r>>8].life = 10; if (ct==PT_PSCN) parts[r>>8].life = 10;
else if (ct==PT_NSCN) parts[r>>8].life = 9; else if (ct==PT_NSCN) parts[r>>8].life = 9;