diff options
Diffstat (limited to 'src/simulation/elements/SOAP.cpp')
| -rw-r--r-- | src/simulation/elements/SOAP.cpp | 86 |
1 files changed, 25 insertions, 61 deletions
diff --git a/src/simulation/elements/SOAP.cpp b/src/simulation/elements/SOAP.cpp index 1d3a55b..b03f6a5 100644 --- a/src/simulation/elements/SOAP.cpp +++ b/src/simulation/elements/SOAP.cpp @@ -89,9 +89,7 @@ int Element_SOAP::update(UPDATE_FUNC_ARGS) if ((parts[i].ctype&6) != 6 && (parts[i].ctype&6)) { int target; - target = i; - while((parts[target].ctype&6) != 6 && (parts[target].ctype&6)) { if (parts[target].ctype&2) @@ -99,7 +97,6 @@ int Element_SOAP::update(UPDATE_FUNC_ARGS) target = parts[target].tmp; sim->detach(target); } - if (parts[target].ctype&4) { target = parts[target].tmp2; @@ -107,20 +104,14 @@ int Element_SOAP::update(UPDATE_FUNC_ARGS) } } } - 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) sim->detach(i); } - - parts[i].vy -= 0.1f; - - parts[i].vy *= 0.5f; + parts[i].vy = (parts[i].vy-0.1f)*0.5f; parts[i].vx *= 0.5f; } - if(!(parts[i].ctype&2)) { for (rx=-2; rx<3; rx++) @@ -130,7 +121,6 @@ int Element_SOAP::update(UPDATE_FUNC_ARGS) r = pmap[y+ry][x+rx]; if (!r) continue; - if ((parts[r>>8].type == PT_SOAP) && (parts[r>>8].ctype&1) && !(parts[r>>8].ctype&4)) Element_SOAP::attach(parts, i, r>>8); } @@ -145,73 +135,59 @@ int Element_SOAP::update(UPDATE_FUNC_ARGS) r = pmap[y+ry][x+rx]; if (!r && !sim->bmap[(y+ry)/CELL][(x+rx)/CELL]) continue; - if (parts[i].temp>0) { if (sim->bmap[(y+ry)/CELL][(x+rx)/CELL] - || (r && sim->elements[r&0xFF].State != ST_GAS - && (r&0xFF) != PT_SOAP && (r&0xFF) != PT_GLAS)) + || (r && sim->elements[r&0xFF].State != ST_GAS + && (r&0xFF) != PT_SOAP && (r&0xFF) != PT_GLAS)) { sim->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) + if ((r&0xFF) == PT_SOAP) { - 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[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; + } + else if (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) { 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) && (parts[parts[i].tmp].ctype&1) && (parts[parts[parts[i].tmp].tmp].ctype&2) && (parts[parts[parts[i].tmp].tmp].ctype&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; } @@ -224,7 +200,6 @@ int Element_SOAP::update(UPDATE_FUNC_ARGS) 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)) @@ -232,27 +207,18 @@ int Element_SOAP::update(UPDATE_FUNC_ARGS) r = pmap[y+ry][x+rx]; if (!r) continue; - if ((r&0xFF) == PT_OIL) { float ax, ay; - - parts[i].vy -= 0.1f; - - parts[i].vy *= 0.5f; + parts[i].vy = (parts[i].vy-0.1f)*0.5f; parts[i].vx *= 0.5f; - 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; + parts[i].vx = parts[r>>8].vx = ax; + parts[i].vy = parts[r>>8].vy = ay; } } } - 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)) @@ -267,12 +233,10 @@ int Element_SOAP::update(UPDATE_FUNC_ARGS) tg = (parts[r>>8].dcolour>>8)&0xFF; tb = (parts[r>>8].dcolour)&0xFF; ta = (parts[r>>8].dcolour>>24)&0xFF; - nr = (tr*blend); ng = (tg*blend); nb = (tb*blend); na = (ta*blend); - parts[r>>8].dcolour = nr<<16 | ng<<8 | nb | na<<24; } } |