mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-08-25 09:11:09 +02:00
Code Issues Projects Releases Wiki Activity

Large speed improvement for QRTZ

Browse Source 
Also prevent growing when sparked.
This commit is contained in:
jacksonmj
2011-05-29 01:31:31 +01:00
committed by Simon Robertshaw
parent 7750cf8ccd
commit 4fd97b93b4
2 changed files with 41 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
src/elements/qrtz.c
View File

@@ -12,20 +12,22 @@ int update_QRTZ(UPDATE_FUNC_ARGS) {
part_change_type(i,x,y,PT_PQRT); part_change_type(i,x,y,PT_PQRT);
} }
} }
//new QRTZ growth // absorb SLTW
for (rx=-2; rx<3 && parts[i].ctype!=-1; rx++) if (parts[i].ctype!=-1)
for (ry=-2; ry<3; ry++) for (rx=-2; rx<3; rx++)
if (x+rx>=0 && y+ry>0 && x+rx<XRES && y+ry<YRES && (rx || ry)) for (ry=-2; ry<3; ry++)
{ if (x+rx>=0 && y+ry>0 && x+rx<XRES && y+ry<YRES && (rx || ry))
r = pmap[y+ry][x+rx];
if ((r>>8)>=NPART || !r)
continue;
else if ((r&0xFF)==PT_SLTW && (1>rand()%2500))
{ {
kill_part(r>>8); r = pmap[y+ry][x+rx];
parts[i].ctype ++; if ((r>>8)>=NPART || !r)
continue;
else if ((r&0xFF)==PT_SLTW && (1>rand()%2500))
{
kill_part(r>>8);
parts[i].ctype ++;
}
} }
} // grow if absorbed SLTW
if (parts[i].ctype>0) if (parts[i].ctype>0)
{ {
for ( trade = 0; trade<5; trade ++) for ( trade = 0; trade<5; trade ++)
@@ -38,15 +40,15 @@ int update_QRTZ(UPDATE_FUNC_ARGS) {
if ((r>>8)<NPART && !r && parts[i].ctype!=0) if ((r>>8)<NPART && !r && parts[i].ctype!=0)
{ {
np = create_part(-1,x+rx,y+ry,PT_QRTZ); np = create_part(-1,x+rx,y+ry,PT_QRTZ);
if (np>0) if (np>-1)
{ {
parts[np].tmp = parts[i].tmp; parts[np].tmp = parts[i].tmp;
parts[i].ctype = 0; parts[i].ctype--;
if (5>rand()%10) if (5>rand()%10)
{ {
parts[np].ctype=-1;//dead qrtz parts[np].ctype=-1;//dead qrtz
} }
else if (1>rand()%15) else if (!parts[i].ctype && 1>rand()%15)
{ {
parts[i].ctype=-1; parts[i].ctype=-1;
} }
@@ -57,29 +59,33 @@ int update_QRTZ(UPDATE_FUNC_ARGS) {
} }
} }
} }
for ( trade = 0; trade<9; trade ++) // diffuse absorbed SLTW
if (parts[i].ctype>0)
{ {
rx = rand()%5-2; for ( trade = 0; trade<9; trade ++)
ry = rand()%5-2;
if (x+rx>=0 && y+ry>0 && x+rx<XRES && y+ry<YRES && (rx || ry))
{ {
r = pmap[y+ry][x+rx]; rx = rand()%5-2;
if ((r>>8)>=NPART || !r) ry = rand()%5-2;
continue; if (x+rx>=0 && y+ry>0 && x+rx<XRES && y+ry<YRES && (rx || ry))
if ((r&0xFF)==t && (parts[i].ctype>parts[r>>8].ctype) && parts[i].ctype>0 && parts[r>>8].ctype>=0 )//diffusion
{ {
tmp = parts[i].ctype - parts[r>>8].ctype; r = pmap[y+ry][x+rx];
if (tmp ==1) if ((r>>8)>=NPART || !r)
continue;
if ((r&0xFF)==t && (parts[i].ctype>parts[r>>8].ctype) && parts[r>>8].ctype>=0 )//diffusion
{ {
parts[r>>8].ctype ++; tmp = parts[i].ctype - parts[r>>8].ctype;
parts[i].ctype --; if (tmp ==1)
trade = 9; {
} parts[r>>8].ctype ++;
if (tmp>0) parts[i].ctype --;
{ break;
parts[r>>8].ctype += tmp/2; }
parts[i].ctype -= tmp/2; if (tmp>0)
trade = 9; {
parts[r>>8].ctype += tmp/2;
parts[i].ctype -= tmp/2;
break;
}
} }
} }
} }

1
src/elements/sprk.c
View File

@@ -11,6 +11,7 @@ int update_SPRK(UPDATE_FUNC_ARGS) {
if (!ct) if (!ct)
ct = PT_METL; ct = PT_METL;
part_change_type(i,x,y,ct); part_change_type(i,x,y,ct);
parts[i].ctype = PT_NONE;
parts[i].life = 4; parts[i].life = 4;
if (ct == PT_WATR) if (ct == PT_WATR)
parts[i].life = 64; parts[i].life = 64;