diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2011-10-23 16:59:04 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2011-10-23 16:59:04 (GMT) |
| commit | b549688fddecbf98b79183bae0d4894f5b1ab154 (patch) | |
| tree | 35f64d820c7c5cdf6be4b9e66f4ab82302a30a26 /src/elements | |
| parent | 58d667281f9f450072bcd580030175252e404064 (diff) | |
| download | powder-b549688fddecbf98b79183bae0d4894f5b1ab154.zip powder-b549688fddecbf98b79183bae0d4894f5b1ab154.tar.gz | |
Compatibility with MSVC - devast8a
Diffstat (limited to 'src/elements')
| -rw-r--r-- | src/elements/dest.c | 4 | ||||
| -rw-r--r-- | src/elements/emp.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/elements/dest.c b/src/elements/dest.c index 17ea2fe..772065a 100644 --- a/src/elements/dest.c +++ b/src/elements/dest.c @@ -1,7 +1,7 @@ #include <element.h> int update_DEST(UPDATE_FUNC_ARGS) { - int r,rx,ry; + int r,rx,ry,topv; rx=rand()%5-2; ry=rand()%5-2; @@ -45,7 +45,7 @@ int update_DEST(UPDATE_FUNC_ARGS) { { if (ptypes[r&0xFF].hconduct) parts[r>>8].temp = restrict_flt(parts[r>>8].temp+10000.0f, MIN_TEMP, MAX_TEMP); } - int topv=pv[y/CELL][x/CELL]/9+parts[r>>8].temp/900; + topv=pv[y/CELL][x/CELL]/9+parts[r>>8].temp/900; if (topv>40.0f) topv=40.0f; pv[y/CELL][x/CELL]+=40.0f+topv; diff --git a/src/elements/emp.c b/src/elements/emp.c index a4c6067..c47c902 100644 --- a/src/elements/emp.c +++ b/src/elements/emp.c @@ -1,7 +1,7 @@ #include <element.h> int update_EMP(UPDATE_FUNC_ARGS) { - int r,rx,ry,ok=0,t; + int r,rx,ry,ok=0,t,n,nx,ny; if (parts[i].life) return 0; for (rx=-2; rx<3; rx++) @@ -42,7 +42,7 @@ int update_EMP(UPDATE_FUNC_ARGS) { else if (rand()%120==0) part_change_type(r, rx, ry, PT_NTCT); } - int n,nx,ny; + for (nx=-2; nx<3; nx++) for (ny=-2; ny<3; ny++) if (rx+nx>=0 && ry+ny>=0 && rx+nx<XRES && ry+ny<YRES && (rx || ry)) |