diff options
| author | Cracker64 <cracker642@gmail.com> | 2011-01-29 01:53:02 (GMT) |
|---|---|---|
| committer | Cracker64 <cracker642@gmail.com> | 2011-01-29 01:53:02 (GMT) |
| commit | 01304db892324f5d0dafb50e03150707bffef13a (patch) | |
| tree | 166b8397f86a4369b5d2e80fe8870f110962ac94 /src/elements | |
| parent | 964ecf2ecfe2246fcecde20bf417c001d58a0c8b (diff) | |
| download | powder-01304db892324f5d0dafb50e03150707bffef13a.zip powder-01304db892324f5d0dafb50e03150707bffef13a.tar.gz | |
fix some visual studio issues.
Diffstat (limited to 'src/elements')
| -rw-r--r-- | src/elements/legacy.c | 2 | ||||
| -rw-r--r-- | src/elements/phot.c | 2 | ||||
| -rw-r--r-- | src/elements/sprk.c | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/elements/legacy.c b/src/elements/legacy.c index 1a345dd..0fd3d6b 100644 --- a/src/elements/legacy.c +++ b/src/elements/legacy.c @@ -2,9 +2,9 @@ // Interactions which only occur when legacy_enable is on int update_legacy_all(UPDATE_FUNC_ARGS) { - if (!legacy_enable) return 0; int r, rx, ry, rt; int t = parts[i].type; + if (!legacy_enable) return 0; if (t==PT_WTRV) { for (rx=-2; rx<3; rx++) for (ry=-2; ry<3; ry++) diff --git a/src/elements/phot.c b/src/elements/phot.c index 7b7afc6..11585f9 100644 --- a/src/elements/phot.c +++ b/src/elements/phot.c @@ -1,9 +1,9 @@ #include <element.h> int update_PHOT(UPDATE_FUNC_ARGS) { - if (1>rand()%10) update_PYRO(UPDATE_FUNC_SUBCALL_ARGS); int r, rt, rx, ry; float rr, rrr; + if (1>rand()%10) update_PYRO(UPDATE_FUNC_SUBCALL_ARGS); for (rx=-1; rx<2; rx++) for (ry=-1; ry<2; ry++) if (x+rx>=0 && y+ry>0 && x+rx<XRES && y+ry<YRES && (rx || ry)) { diff --git a/src/elements/sprk.c b/src/elements/sprk.c index 58692ee..ddac968 100644 --- a/src/elements/sprk.c +++ b/src/elements/sprk.c @@ -1,8 +1,9 @@ #include <element.h> int update_SPRK(UPDATE_FUNC_ARGS) { - update_PYRO(UPDATE_FUNC_SUBCALL_ARGS); int r, rx, ry, rt, conduct_sprk, nearp, pavg, ct = parts[i].ctype; + update_PYRO(UPDATE_FUNC_SUBCALL_ARGS); + if (parts[i].life<=0) { if (ct==PT_WATR||ct==PT_SLTW||ct==PT_PSCN||ct==PT_NSCN||ct==PT_ETRD||ct==PT_INWR) |