diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2011-07-27 12:07:41 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2011-07-27 12:07:41 (GMT) |
| commit | 58d96de4ce2eacbda5b63ed1ac6ee19d17f03d39 (patch) | |
| tree | c63592d68617b69a99543122d84db00dd5eef17b /src | |
| parent | eecf5ad352a7c3d13dd030f59b3c37c002fc160e (diff) | |
| download | powder-58d96de4ce2eacbda5b63ed1ac6ee19d17f03d39.zip powder-58d96de4ce2eacbda5b63ed1ac6ee19d17f03d39.tar.gz | |
Revert "DLAY element"
This reverts commit 7338545ab43b1871cea0f91a15746e534d7a9e9b.
Diffstat (limited to 'src')
| -rw-r--r-- | src/elements/sprk.c | 24 | ||||
| -rw-r--r-- | src/elements/swch.c | 1 |
2 files changed, 5 insertions, 20 deletions
diff --git a/src/elements/sprk.c b/src/elements/sprk.c index c95216c..039453f 100644 --- a/src/elements/sprk.c +++ b/src/elements/sprk.c @@ -19,8 +19,6 @@ int update_SPRK(UPDATE_FUNC_ARGS) { parts[i].life = 54; if (ct == PT_SWCH) parts[i].life = 14; - if (ct == PT_DLAY) - parts[i].temp = *((float*)(&parts[i].tmp2)); return 0; } if (ct==PT_SPRK) @@ -130,8 +128,6 @@ int update_SPRK(UPDATE_FUNC_ARGS) { if (ct==PT_INST&&rt!=PT_NSCN) conduct_sprk = 0; if (ct==PT_SWCH && (rt==PT_PSCN||rt==PT_NSCN||rt==PT_WATR||rt==PT_SLTW||rt==PT_NTCT||rt==PT_PTCT||rt==PT_INWR)) conduct_sprk = 0; - if (ct==PT_DLAY && !((rt==PT_PSCN || rt==PT_NSCN) && parts[i].tmp!=(r>>8))) - conduct_sprk = 0; if (rt==PT_QRTZ && !((ct==PT_NSCN||ct==PT_METL||ct==PT_PSCN||ct==PT_QRTZ) && (parts[r>>8].temp<173.15||pv[(y+ry)/CELL][(x+rx)/CELL]>8))) conduct_sprk = 0; if (rt==PT_NTCT && !(ct==PT_NSCN || ct==PT_NTCT || (ct==PT_PSCN&&parts[r>>8].temp>373.0f))) @@ -142,8 +138,6 @@ int update_SPRK(UPDATE_FUNC_ARGS) { conduct_sprk = 0; if (rt==PT_INST&&ct!=PT_PSCN) conduct_sprk = 0; - if (rt==PT_DLAY && !(ct==PT_PSCN || ct==PT_NSCN)) - conduct_sprk = 0; if (conduct_sprk) { if (rt==PT_WATR||rt==PT_SLTW) { @@ -162,19 +156,11 @@ int update_SPRK(UPDATE_FUNC_ARGS) { } } else if (parts[r>>8].life==0 && (parts[i].life<3 || ((r>>8)<i && parts[i].life<4))) { - if (rt==PT_DLAY) { - parts[r>>8].life = (int)(parts[r>>8].temp - 273.15f); - parts[r>>8].tmp = i; - parts[r>>8].tmp2 = *((int*)(&parts[r>>8].temp)); - parts[r>>8].ctype = rt; - part_change_type(r>>8,x+rx,y+ry,PT_SPRK); - } else { - parts[r>>8].life = 4; - parts[r>>8].ctype = rt; - part_change_type(r>>8,x+rx,y+ry,PT_SPRK); - if (parts[r>>8].temp+10.0f<673.0f&&!legacy_enable&&(rt==PT_METL||rt==PT_BMTL||rt==PT_BRMT||rt==PT_PSCN||rt==PT_NSCN||rt==PT_ETRD||rt==PT_NBLE||rt==PT_IRON)) - parts[r>>8].temp = parts[r>>8].temp+10.0f; - } + parts[r>>8].life = 4; + parts[r>>8].ctype = rt; + part_change_type(r>>8,x+rx,y+ry,PT_SPRK); + if (parts[r>>8].temp+10.0f<673.0f&&!legacy_enable&&(rt==PT_METL||rt==PT_BMTL||rt==PT_BRMT||rt==PT_PSCN||rt==PT_NSCN||rt==PT_ETRD||rt==PT_NBLE||rt==PT_IRON)) + parts[r>>8].temp = parts[r>>8].temp+10.0f; } else if (ct==PT_ETRD && parts[i].life==5) { diff --git a/src/elements/swch.c b/src/elements/swch.c index fc9f8ab..5642419 100644 --- a/src/elements/swch.c +++ b/src/elements/swch.c @@ -21,7 +21,6 @@ int update_SWCH(UPDATE_FUNC_ARGS) { parts[i].life = 10; } else if (rt==PT_SPRK&&parts[i].life==10&&parts[r>>8].ctype!=PT_PSCN&&parts[r>>8].ctype!=PT_NSCN) { - if (parts[r>>8].ctype==PT_DLAY && parts[r>>8].life > 2) continue; part_change_type(i,x,y,PT_SPRK); parts[i].ctype = PT_SWCH; parts[i].life = 4; |