diff options
| author | Cracker64 <cracker642@gmail.com> | 2011-01-29 02:57:20 (GMT) |
|---|---|---|
| committer | Cracker64 <cracker642@gmail.com> | 2011-01-29 02:57:20 (GMT) |
| commit | 4b5337c03a0a64a12e1d66829c14af73f1ff0398 (patch) | |
| tree | 5663f738bdf7b8d0e924db6acb8e010d0174f1c3 | |
| parent | 01304db892324f5d0dafb50e03150707bffef13a (diff) | |
| download | powder-4b5337c03a0a64a12e1d66829c14af73f1ff0398.zip powder-4b5337c03a0a64a12e1d66829c14af73f1ff0398.tar.gz | |
finally fixed visual studio compiling, yay
| -rw-r--r-- | includes/element.h | 1 | ||||
| -rw-r--r-- | includes/powder.h | 4 | ||||
| -rw-r--r-- | src/elements/elementmisc.c (renamed from src/elements/misc.c) | 0 | ||||
| -rw-r--r-- | src/elements/firw.c | 3 |
4 files changed, 5 insertions, 3 deletions
diff --git a/includes/element.h b/includes/element.h index ec32df2..be0388d 100644 --- a/includes/element.h +++ b/includes/element.h @@ -4,5 +4,6 @@ #include "powder.h" #include "misc.h" +#include "math.h" #endif diff --git a/includes/powder.h b/includes/powder.h index 9991317..251605b 100644 --- a/includes/powder.h +++ b/includes/powder.h @@ -837,9 +837,9 @@ extern inline int is_wire_off(int x, int y); void set_emap(int x, int y); #if defined(WIN32) && !defined(__GNUC__) -_inline int parts_avg(int ci, int ni, int t); +extern _inline int parts_avg(int ci, int ni, int t); #else -int parts_avg(int ci, int ni, int t); +extern int parts_avg(int ci, int ni, int t); #endif int nearest_part(int ci, int t); diff --git a/src/elements/misc.c b/src/elements/elementmisc.c index a284b3a..a284b3a 100644 --- a/src/elements/misc.c +++ b/src/elements/elementmisc.c diff --git a/src/elements/firw.c b/src/elements/firw.c index ae1f56d..c41400e 100644 --- a/src/elements/firw.c +++ b/src/elements/firw.c @@ -35,12 +35,13 @@ int update_FIRW(UPDATE_FUNC_ARGS) { } else if (parts[i].tmp==2) { int col = rand()%200+4; + int tmul; for (rx=-2; rx<3; rx++) for (ry=-2; ry<3; ry++) if (x+rx>=0 && y+ry>0 && x+rx<XRES && y+ry<YRES && (rx || ry)) { r = pmap[y+ry][x+rx]; - int tmul = rand()%7; + tmul = rand()%7; create_part(-1, x+rx, y+ry, PT_FIRW); r = pmap[y+ry][x+rx]; if ((r>>8)>=NPART || !r) |