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

Some work on frozen bubbles.

Browse Source
This commit is contained in:
savask 2011-05-27 00:18:51 +08:00 committed by Simon Robertshaw
parent a48e477fca
commit e42e7d019e
1 changed files with 37 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
src/elements/soap.c
View File

@ -10,42 +10,45 @@ int update_SOAP(UPDATE_FUNC_ARGS)
if ((parts[i].ctype&1) == 1) if ((parts[i].ctype&1) == 1)
{ {
if (parts[i].life<=0) if (parts[i].temp>0)
{ {
if ((parts[i].ctype&6) != 6 && parts[i].ctype>1) if (parts[i].life<=0)
{ {
int target; if ((parts[i].ctype&6) != 6 && parts[i].ctype>1)
target = i;
while((parts[target].ctype&6) != 6 && parts[target].ctype>1)
{ {
if ((parts[target].ctype&2) == 2) int target;
{
target = parts[target].tmp;
detach(target);
}
if ((parts[target].ctype&4) == 4) target = i;
while((parts[target].ctype&6) != 6 && parts[target].ctype>1)
{ {
target = parts[target].tmp2; if ((parts[target].ctype&2) == 2)
detach(target); {
target = parts[target].tmp;
detach(target);
}
if ((parts[target].ctype&4) == 4)
{
target = parts[target].tmp2;
detach(target);
}
} }
} }
if ((parts[i].ctype&6) != 6)
parts[i].ctype = 0;
if ((parts[i].ctype&6) == 6 && (parts[parts[i].tmp].ctype&6) == 6 && parts[parts[i].tmp].tmp == i)
detach(i);
} }
if ((parts[i].ctype&6) != 6) parts[i].vy -= 0.1f;
parts[i].ctype = 0;
if ((parts[i].ctype&6) == 6 && (parts[parts[i].tmp].ctype&6) == 6 && parts[parts[i].tmp].tmp == i) parts[i].vy *= 0.5f;
detach(i); parts[i].vx *= 0.5f;
} }
parts[i].vy -= 0.1f;
parts[i].vy *= 0.5f;
parts[i].vx *= 0.5f;
if((parts[i].ctype&2) != 2) if((parts[i].ctype&2) != 2)
{ {
for (rx=-2; rx<3; rx++) for (rx=-2; rx<3; rx++)
@ -89,15 +92,19 @@ int update_SOAP(UPDATE_FUNC_ARGS)
if (x+rx>=0 && y+ry>0 && x+rx<XRES && y+ry<YRES && (rx || ry)) if (x+rx>=0 && y+ry>0 && x+rx<XRES && y+ry<YRES && (rx || ry))
{ {
r = pmap[y+ry][x+rx]; r = pmap[y+ry][x+rx];
if ((r>>8)>=NPART || !r) if (((r>>8)>=NPART || !r) && !bmap[(y+ry)/CELL][(x+rx)/CELL])
continue; continue;
if (((r&0xFF) != PT_SOAP && (r&0xFF) != PT_GLAS) if (parts[i].temp>0)
|| (parts[r>>8].ctype == 0 && (r&0xFF) == PT_SOAP
&& (abs(parts[r>>8].vx)<2 || abs(parts[r>>8].vy)<2)))
{ {
detach(i); if (bmap[(y+ry)/CELL][(x+rx)/CELL]
continue; || ((r&0xFF) != PT_SOAP && (r&0xFF) != PT_GLAS)
|| (parts[r>>8].ctype == 0 && (r&0xFF) == PT_SOAP
&& (abs(parts[r>>8].vx)<2 || abs(parts[r>>8].vy)<2)))
{
detach(i);
continue;
}
} }
if ((r&0xFF) == PT_SOAP && parts[r>>8].ctype == 1) if ((r&0xFF) == PT_SOAP && parts[r>>8].ctype == 1)