diff options
| author | jacob1 <jfu614@gmail.com> | 2013-05-16 21:01:33 (GMT) |
|---|---|---|
| committer | jacob1 <jfu614@gmail.com> | 2013-05-16 21:01:33 (GMT) |
| commit | 6f8e2c03456552bdd54355606b8b8389f884c06d (patch) | |
| tree | dc51900a69809f0230239dcee562d2758d6e550f /src/simulation/tools | |
| parent | 751da54183acb5f7dae94e815aec1e0daf7bbd36 (diff) | |
| download | powder-6f8e2c03456552bdd54355606b8b8389f884c06d.zip powder-6f8e2c03456552bdd54355606b8b8389f884c06d.tar.gz | |
remove unneeded / duplicate constants, fix SPC_AIR/other tools so it won't conflict with lua elements (the 11th one won't work right now)
Diffstat (limited to 'src/simulation/tools')
| -rw-r--r-- | src/simulation/tools/Cool.cpp | 5 | ||||
| -rw-r--r-- | src/simulation/tools/Heat.cpp | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/simulation/tools/Cool.cpp b/src/simulation/tools/Cool.cpp index 4c5788d..07c24f9 100644 --- a/src/simulation/tools/Cool.cpp +++ b/src/simulation/tools/Cool.cpp @@ -12,7 +12,10 @@ int Tool_Cool::Perform(Simulation * sim, Particle * cpart, int x, int y, float s { if(!cpart) return 0; - cpart->temp -= strength; + if (cpart->type == PT_PUMP || cpart->type == PT_GPMP) + cpart->temp -= .1f*strength; + else + cpart->temp -= strength; if(cpart->temp > MAX_TEMP) cpart->temp = MAX_TEMP; if(cpart->temp < 0) diff --git a/src/simulation/tools/Heat.cpp b/src/simulation/tools/Heat.cpp index 1be3e6e..2d6510c 100644 --- a/src/simulation/tools/Heat.cpp +++ b/src/simulation/tools/Heat.cpp @@ -12,7 +12,10 @@ int Tool_Heat::Perform(Simulation * sim, Particle * cpart, int x, int y, float s { if(!cpart) return 0; - cpart->temp += strength; + if (cpart->type == PT_PUMP || cpart->type == PT_GPMP) + cpart->temp += .1f*strength; + else + cpart->temp += strength; if(cpart->temp > MAX_TEMP) cpart->temp = MAX_TEMP; if(cpart->temp < 0) |