summaryrefslogtreecommitdiff
path: root/src/elements/stkm.c
diff options
context:
space:
mode:
authorjacksonmj <mj-pt@jacksonmj.co.uk>2011-06-09 18:46:41 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2011-06-11 12:00:42 (GMT)
commit93316a9f1d687a86558daef529d583f5ae2be992 (patch)
treeae98719e4fe31f5a06a30a54208ce85ec200b5ae /src/elements/stkm.c
parent7ae52660f58188a1bc9d8e69ff2711c6737c7e66 (diff)
downloadpowder-93316a9f1d687a86558daef529d583f5ae2be992.zip
powder-93316a9f1d687a86558daef529d583f5ae2be992.tar.gz
Fix a load of memory leaks
Also fix some compiler warnings (missing headers, wrong pointer type for modf, etc) and move variable declarations for Visual Studio.
Diffstat (limited to 'src/elements/stkm.c')
-rw-r--r--src/elements/stkm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/elements/stkm.c b/src/elements/stkm.c
index 8b19406..01990f6 100644
--- a/src/elements/stkm.c
+++ b/src/elements/stkm.c
@@ -86,7 +86,7 @@ int update_STKM(UPDATE_FUNC_ARGS) {
//Go left
r = pmap[(int)(parts[i].y+10)][(int)(parts[i].x)];
- if (((int)(player[0])&0x01) == 0x01 && ((r&0xFF>=PT_NUM) || ptypes[r&0xFF].state != ST_GAS))
+ if (((int)(player[0])&0x01) == 0x01 && (((r&0xFF)>=PT_NUM) || ptypes[r&0xFF].state != ST_GAS))
{
if (r>=PT_NUM || (ptypes[r&0xFF].state != ST_LIQUID
&& (r&0xFF) != PT_LNTG))
@@ -125,7 +125,7 @@ int update_STKM(UPDATE_FUNC_ARGS) {
//Go right
r = pmap[(int)(parts[i].y+10)][(int)(parts[i].x)];
- if (((int)(player[0])&0x02) == 0x02 && ((r&0xFF>=PT_NUM) || ptypes[r&0xFF].state != ST_GAS))
+ if (((int)(player[0])&0x02) == 0x02 && (((r&0xFF)>=PT_NUM) || ptypes[r&0xFF].state != ST_GAS))
{
if (r>=PT_NUM || (ptypes[r&0xFF].state != ST_LIQUID
&& (r&0xFF) != PT_LNTG))