diff options
| author | jacob1 <jfu614@gmail.com> | 2013-02-24 04:42:54 (GMT) |
|---|---|---|
| committer | jacob1 <jfu614@gmail.com> | 2013-02-24 04:45:40 (GMT) |
| commit | 6b1e99a73169550e8bcb4c29ff105dde83924cea (patch) | |
| tree | b407cb73874392e46803b23523430fa95cf62a9d /src/simulation/elements/dcel.cpp | |
| parent | 20d8eff7f526aa91997ec09266374d14775607ef (diff) | |
| download | powder-6b1e99a73169550e8bcb4c29ff105dde83924cea.zip powder-6b1e99a73169550e8bcb4c29ff105dde83924cea.tar.gz | |
allow ACEL and DCEL strength to be modified with ctype
Diffstat (limited to 'src/simulation/elements/dcel.cpp')
| -rw-r--r-- | src/simulation/elements/dcel.cpp | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/simulation/elements/dcel.cpp b/src/simulation/elements/dcel.cpp index 07f930b..294c840 100644 --- a/src/simulation/elements/dcel.cpp +++ b/src/simulation/elements/dcel.cpp @@ -62,8 +62,17 @@ int Element_DCEL::update(UPDATE_FUNC_ARGS) continue; if(sim->elements[r&0xFF].Properties & (TYPE_PART | TYPE_LIQUID | TYPE_GAS | TYPE_ENERGY)) { - parts[r>>8].vx *= 0.9f; - parts[r>>8].vy *= 0.9f; + if (parts[i].ctype) + { + int change = parts[i].ctype > 100 ? 100 : parts[i].ctype < 0 ? 0 : parts[i].ctype; + parts[r>>8].vx *= 1-change/100.0f; + parts[r>>8].vy *= 1-change/100.0f; + } + else + { + parts[r>>8].vx *= 0.9f; + parts[r>>8].vy *= 0.9f; + } parts[i].tmp = 1; } } |
