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

Revert "Dem bubbles"

Browse Source 
This reverts commit 607572cf0d.
This commit is contained in:
Simon Robertshaw 2011-05-05 20:08:13 +01:00
parent 607572cf0d
commit fb408ab82b
3 changed files with 0 additions and 247 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/console.c
View File

@ -1108,32 +1108,6 @@ int process_command_old(pixel *vid_buf, char *console, char *console_error)
strcpy(console_error, "Could not create particle");
}
}
else if (strcmp(console2, "bubble")==0 && console3[0])
{
if (console_parse_coords(console3, &nx, &ny, console_error))
{
int first, rem1, rem2;
first = create_part(-1, nx+18, ny, PT_SOAP);
rem1 = first;
for (i = 1; i<=30; i++)
{
rem2 = create_part(-1, nx+18*cosf(i/5.0), ny+18*sinf(i/5.0), PT_SOAP);
parts[rem1].ctype = 7;
parts[rem1].tmp = rem2;
parts[rem2].tmp2 = rem1;
rem1 = rem2;
}
parts[rem1].ctype = 7;
parts[rem1].tmp = first;
parts[first].tmp2 = rem1;
parts[first].ctype = 7;
}
}
else if ((strcmp(console2, "delete")==0 || strcmp(console2, "kill")==0) && console3[0])
{
if (console_parse_partref(console3, &i, console_error))

217
src/elements/soap.c
View File

@ -1,217 +0,0 @@
#include <element.h>
void detach(int i)
{
if ((parts[i].ctype&2) == 2)
{
if ((parts[parts[i].tmp].ctype&4) == 4)
parts[parts[i].tmp].ctype ^= 4;
}
if ((parts[i].ctype&4) == 4)
{
if ((parts[parts[i].tmp2].ctype&2) == 2)
parts[parts[i].tmp2].ctype ^= 2;
}
parts[i].ctype = 0;
}
int update_SOAP(UPDATE_FUNC_ARGS)
{
int r, rx, ry;
//0x01 - bubble on/off
//0x02 - first mate yes/no
//0x04 - "back" mate yes/no
if ((parts[i].ctype&1) == 1)
{
if (parts[i].life<=0)
{
if ((parts[i].ctype&6) != 6 && parts[i].ctype>1)
{
int target;
target = i;
while((parts[target].ctype&6) != 6 && parts[target].ctype>1)
{
if ((parts[target].ctype&2) == 2)
{
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);
}
parts[i].vy -= 0.1f;
parts[i].vy *= 0.5f;
parts[i].vx *= 0.5f;
if((parts[i].ctype&2) != 2)
{
for (rx=-2; rx<3; rx++)
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;
if ((parts[r>>8].type == PT_SOAP) && ((parts[r>>8].ctype&1) == 1)
&& ((parts[r>>8].ctype&4) != 4))
{
if ((parts[r>>8].ctype&2) == 2)
{
parts[i].tmp = r>>8;
parts[r>>8].tmp2 = i;
parts[i].ctype |= 2;
parts[r>>8].ctype |= 4;
}
else
{
if ((parts[i].ctype&2) != 2)
{
parts[i].tmp = r>>8;
parts[r>>8].tmp2 = i;
parts[i].ctype |= 2;
parts[r>>8].ctype |= 4;
}
}
}
}
}
else
{
if (parts[i].life<=0)
for (rx=-2; rx<3; rx++)
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;
if (((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)
{
int buf;
buf = parts[i].tmp;
parts[i].tmp = r>>8;
parts[buf].tmp2 = r>>8;
parts[r>>8].tmp2 = i;
parts[r>>8].tmp = buf;
parts[r>>8].ctype = 7;
}
if ((r&0xFF) == PT_SOAP && parts[r>>8].ctype == 7 && parts[i].tmp != r>>8 && parts[i].tmp2 != r>>8)
{
int buf;
parts[parts[i].tmp].tmp2 = parts[r>>8].tmp2;
parts[parts[r>>8].tmp2].tmp = parts[i].tmp;
parts[r>>8].tmp2 = i;
parts[i].tmp = r>>8;
}
}
}
if((parts[i].ctype&2) == 2)
{
float d, dx, dy;
dx = parts[i].x - parts[parts[i].tmp].x;
dy = parts[i].y - parts[parts[i].tmp].y;
d = 9/(pow(dx, 2)+pow(dy, 2)+9)-0.5;
parts[parts[i].tmp].vx -= dx*d;
parts[parts[i].tmp].vy -= dy*d;
parts[i].vx += dx*d;
parts[i].vy += dy*d;
if (((parts[parts[i].tmp].ctype&2) == 2) && ((parts[parts[i].tmp].ctype&1) == 1)
&& ((parts[parts[parts[i].tmp].tmp].ctype&2) == 2) && ((parts[parts[parts[i].tmp].tmp].ctype&1) == 1))
{
int ii;
ii = parts[parts[parts[i].tmp].tmp].tmp;
dx = parts[ii].x - parts[parts[i].tmp].x;
dy = parts[ii].y - parts[parts[i].tmp].y;
d = 81/(pow(dx, 2)+pow(dy, 2)+81)-0.5;
parts[parts[i].tmp].vx -= dx*d*0.5f;
parts[parts[i].tmp].vy -= dy*d*0.5f;
parts[ii].vx += dx*d*0.5f;
parts[ii].vy += dy*d*0.5f;
}
}
}
else
{
if (pv[y/CELL][x/CELL]>0.5f || pv[y/CELL][x/CELL]<(-0.5f))
{
parts[i].ctype = 1;
parts[i].life = 10;
}
for (rx=-2; rx<3; rx++)
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;
if ((r&0xFF) == PT_OIL)
{
parts[i].vy -= 0.1f;
parts[i].vy *= 0.5f;
parts[i].vx *= 0.5f;
float ax, ay;
ax = (parts[i].vx + parts[r>>8].vx)/2;
ay = (parts[i].vy + parts[r>>8].vy)/2;
parts[i].vx = ax;
parts[i].vy = ay;
parts[r>>8].vx = ax;
parts[r>>8].vy = ay;
}
}
}
return 0;
}

4
src/main.c
View File

@ -667,8 +667,6 @@ int parse_save(void *save, int size, int replace, int x0, int y0, unsigned char
parts[k].type = j;
if (j == PT_PHOT)
parts[k].ctype = 0x3fffffff;
if (j == PT_SOAP)
parts[k].ctype = 0;
parts[k].x = (float)x;
parts[k].y = (float)y;
m[(x-x0)+(y-y0)*w] = k+1;
@ -683,8 +681,6 @@ int parse_save(void *save, int size, int replace, int x0, int y0, unsigned char
parts[fp[i]].tmp = 50;
if (j == PT_PHOT)
parts[fp[i]].ctype = 0x3fffffff;
if (j == PT_SOAP)
parts[k].ctype = 0;
parts[fp[i]].x = (float)x;
parts[fp[i]].y = (float)y;
m[(x-x0)+(y-y0)*w] = fp[i]+1;