matthew/The-Powder-Toy
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

finally fixed visual studio compiling, yay

Browse Source
This commit is contained in:
Cracker64 2011-01-28 21:57:20 -05:00
parent 01304db892
commit 4b5337c03a
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
includes/element.h
View File

@ -4,5 +4,6 @@
#include "powder.h" #include "powder.h"
#include "misc.h" #include "misc.h"
#include "math.h"
#endif #endif

4
includes/powder.h
View File

@ -837,9 +837,9 @@ extern inline int is_wire_off(int x, int y);
void set_emap(int x, int y); void set_emap(int x, int y);
#if defined(WIN32) && !defined(__GNUC__) #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 #else
int parts_avg(int ci, int ni, int t); extern int parts_avg(int ci, int ni, int t);
#endif #endif
int nearest_part(int ci, int t); int nearest_part(int ci, int t);

0
src/elements/misc.c → src/elements/elementmisc.c
View File

3
src/elements/firw.c
View File

@ -35,12 +35,13 @@ int update_FIRW(UPDATE_FUNC_ARGS) {
} }
else if (parts[i].tmp==2) { else if (parts[i].tmp==2) {
int col = rand()%200+4; int col = rand()%200+4;
int tmul;
for (rx=-2; rx<3; rx++) for (rx=-2; rx<3; rx++)
for (ry=-2; ry<3; ry++) for (ry=-2; ry<3; ry++)
if (x+rx>=0 && y+ry>0 && x+rx<XRES && y+ry<YRES && (rx || ry)) if (x+rx>=0 && y+ry>0 && x+rx<XRES && y+ry<YRES && (rx || ry))
{ {
r = pmap[y+ry][x+rx]; r = pmap[y+ry][x+rx];
int tmul = rand()%7; tmul = rand()%7;
create_part(-1, x+rx, y+ry, PT_FIRW); create_part(-1, x+rx, y+ry, PT_FIRW);
r = pmap[y+ry][x+rx]; r = pmap[y+ry][x+rx];
if ((r>>8)>=NPART || !r) if ((r>>8)>=NPART || !r)