summaryrefslogtreecommitdiff
path: root/src/elements
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2011-07-12 17:10:10 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2011-07-12 17:10:10 (GMT)
commit7480442c67682c40672dd862a921972e816ce59e (patch)
tree9784f3c8b4e8e6309d458e537f26ad68a4a73392 /src/elements
parent45fe00bef96958f6f26174a6fbce6bf0498a4a98 (diff)
downloadpowder-7480442c67682c40672dd862a921972e816ce59e.zip
powder-7480442c67682c40672dd862a921972e816ce59e.tar.gz
Move SING back to where it belongs, acid heats up when dissolving materials
Diffstat (limited to 'src/elements')
-rw-r--r--src/elements/acid.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/elements/acid.c b/src/elements/acid.c
index 875f148..1759dec 100644
--- a/src/elements/acid.c
+++ b/src/elements/acid.c
@@ -22,6 +22,11 @@ int update_ACID(UPDATE_FUNC_ARGS) {
{
if (parts_avg(i, r>>8,PT_GLAS)!= PT_GLAS)//GLAS protects stuff from acid
{
+ float newtemp = ((60.0f-(float)ptypes[r&0xFF].hardness))*7.0f;
+ if(newtemp < 0){
+ newtemp = 0;
+ }
+ parts[i].temp += newtemp;
parts[i].life--;
kill_part(r>>8);
}