summaryrefslogtreecommitdiff
path: root/src/simulation/elements/SOAP.cpp
diff options
context:
space:
mode:
authorcracker64 <cracker642@gmail.com>2013-03-02 05:42:07 (GMT)
committer cracker64 <cracker642@gmail.com>2013-03-02 05:42:07 (GMT)
commitd58100dc070be97073d1f02cdbb7a382a67c376b (patch)
treecc0fc022e7f8524b7f9bcf5ed93eb83980596f91 /src/simulation/elements/SOAP.cpp
parenta9f4b5fe343fb0ada8934030abe6363695ea43dc (diff)
downloadpowder-d58100dc070be97073d1f02cdbb7a382a67c376b.zip
powder-d58100dc070be97073d1f02cdbb7a382a67c376b.tar.gz
More fixes, redid a bunch of SPRK, so far everything I've tested works fine.
Diffstat (limited to 'src/simulation/elements/SOAP.cpp')
-rw-r--r--src/simulation/elements/SOAP.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/simulation/elements/SOAP.cpp b/src/simulation/elements/SOAP.cpp
index b03f6a5..72d74e0 100644
--- a/src/simulation/elements/SOAP.cpp
+++ b/src/simulation/elements/SOAP.cpp
@@ -210,10 +210,8 @@ int Element_SOAP::update(UPDATE_FUNC_ARGS)
if ((r&0xFF) == PT_OIL)
{
float ax, ay;
- 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;
+ ax = (parts[i].vx*0.5f + parts[r>>8].vx)/2;
+ ay = ((parts[i].vy-0.1f)*0.5f + parts[r>>8].vy)/2;
parts[i].vx = parts[r>>8].vx = ax;
parts[i].vy = parts[r>>8].vy = ay;
}