diff options
| author | Jacob1 <jfu614@gmail.com> | 2012-03-15 00:43:53 (GMT) |
|---|---|---|
| committer | Jacob1 <jfu614@gmail.com> | 2012-03-15 00:43:53 (GMT) |
| commit | 4fcfb05f25d8f7b0edcf67c11ea6676ff0e0e047 (patch) | |
| tree | 9b9e6f9a0ed5d756b52a4ca66d41161cff2e46b7 /src | |
| parent | 8ed861fb7eaf8417f278e1f2270fdd2007eee17f (diff) | |
| download | powder-4fcfb05f25d8f7b0edcf67c11ea6676ff0e0e047.zip powder-4fcfb05f25d8f7b0edcf67c11ea6676ff0e0e047.tar.gz | |
fix 10000 compiler warnings, put nble.c in right spot, delete create_moving_solid
Diffstat (limited to 'src')
| -rw-r--r-- | src/elements/nble.c | 26 | ||||
| -rw-r--r-- | src/powder.c | 16 |
2 files changed, 26 insertions, 16 deletions
diff --git a/src/elements/nble.c b/src/elements/nble.c new file mode 100644 index 0000000..43264b4 --- /dev/null +++ b/src/elements/nble.c @@ -0,0 +1,26 @@ +#include <element.h> + +int update_NBLE(UPDATE_FUNC_ARGS) +{ + if (parts[i].temp > 5273.15 && pv[y/CELL][x/CELL] > 100.0f) + { + if (rand()%5 < 1) + { + int j; + float temp = parts[i].temp; + part_change_type(i,x,y,PT_PLSM); + parts[i].life = rand()%150+50; + j = create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_NEUT); if (j != -1) + j = create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_ELEC); if (j != -1) + j = create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_PHOT); + if (j != -1) { parts[j].ctype = 0xFF0000; parts[j].temp = temp; } + + j = create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_CO2); + if (j != -1) parts[j].temp = temp - 1000; + + parts[i].temp += 10000; + pv[y/CELL][x/CELL] += 30; + } + } + return 0; +} diff --git a/src/powder.c b/src/powder.c index 5ca522c..233fa32 100644 --- a/src/powder.c +++ b/src/powder.c @@ -3149,22 +3149,6 @@ int create_parts2(int f, int x, int y, int c, int rx, int ry, int flags) return 0; } -void create_moving_solid(int x, int y, int rx, int ry) -{ - int j, i; - creatingsolid = 0; - if (rx < 3 || ry < 3 || numballs >= 255) - return; - create_part(-2, x, y, PT_MOVS); - if (!creatingsolid) - return; - for (j=-ry; j<=ry; j++) - for (i=-rx; i<=rx; i++) - if (InCurrentBrush(i ,j ,rx ,ry) && !InCurrentBrush(i ,j ,rx-1 ,ry-1)) - create_part(-2, x+i, y+j, PT_MOVS); - creatingsolid = 0; -} - int InCurrentBrush(int i, int j, int rx, int ry) { switch(CURRENT_BRUSH) |
