diff options
| author | Cracker64 <cracker642@gmail.com> | 2011-02-24 05:51:09 (GMT) |
|---|---|---|
| committer | Cracker64 <cracker642@gmail.com> | 2011-02-24 05:51:09 (GMT) |
| commit | bf24a261397636d194748ba241620655b470a69e (patch) | |
| tree | a187892730d52881e9ffcf220c5b972af2475ac2 | |
| parent | 98a61e0e201d90157ca9c77b9e996663d12e9dff (diff) | |
| download | powder-bf24a261397636d194748ba241620655b470a69e.zip powder-bf24a261397636d194748ba241620655b470a69e.tar.gz | |
forgot powder.h, and renamed drag to wind
| -rw-r--r-- | includes/powder.h | 7 | ||||
| -rw-r--r-- | src/main.c | 4 |
2 files changed, 7 insertions, 4 deletions
diff --git a/includes/powder.h b/includes/powder.h index 9964aba..a78d35f 100644 --- a/includes/powder.h +++ b/includes/powder.h @@ -196,7 +196,8 @@ #define PT_STAR 144 #define PT_FROG 145 #define PT_BRAN 146 -#define PT_NUM 147 +#define PT_WIND 147 +#define PT_NUM 148 #define R_TEMP 22 #define MAX_TEMP 9999 @@ -516,7 +517,8 @@ static const part_type ptypes[PT_NUM] = {"STAR", PIXPACK(0x0000FF), 0.0f, 0.00f * CFDS, 0.90f, 0.00f, 0.0f, 0.0f, 0.00f, 0.000f * CFDS, 0, 0, 0, 0, 0, 1, 100, SC_LIFE, 9000.0f, 40, "Like Star Wars rule S3456/B278/6", ST_NONE, TYPE_SOLID|PROP_LIFE, NULL}, {"FROG", PIXPACK(0x00AA00), 0.0f, 0.00f * CFDS, 0.90f, 0.00f, 0.0f, 0.0f, 0.00f, 0.000f * CFDS, 0, 0, 0, 0, 0, 1, 100, SC_LIFE, 9000.0f, 40, "Frogs S12/B34/3", ST_NONE, TYPE_SOLID|PROP_LIFE, NULL}, {"BRAN", PIXPACK(0xCCCC00), 0.0f, 0.00f * CFDS, 0.90f, 0.00f, 0.0f, 0.0f, 0.00f, 0.000f * CFDS, 0, 0, 0, 0, 0, 1, 100, SC_LIFE, 9000.0f, 40, "Brian 6 S6/B246/3", ST_NONE, TYPE_SOLID|PROP_LIFE, NULL}, - //Name Colour Advec Airdrag Airloss Loss Collid Grav Diffus Hotair Fal Burn Exp Mel Hrd M Weights Section H Ins Description + {"WIND", PIXPACK(0x000000), 0.0f, 0.00f * CFDS, 0.90f, 0.00f, 0.0f, 0.0f, 0.00f, 0.000f * CFDS, 0, 0, 0, 0, 0, 1, 100, SC_SPECIAL, 0.0f, 40, "Drag tool", ST_NONE, ST_NONE, NULL}, +//Name Colour Advec Airdrag Airloss Loss Collid Grav Diffus Hotair Fal Burn Exp Mel Hrd M Weights Section H Ins Description }; // temporarily define abbreviations for impossible p/t values @@ -678,6 +680,7 @@ static part_transition ptransitions[PT_NUM] = /* GOL */ {IPL, NT, IPH, NT, ITL, NT, ITH, NT}, /* GOL */ {IPL, NT, IPH, NT, ITL, NT, ITH, NT}, /* GOL */ {IPL, NT, IPH, NT, ITL, NT, ITH, NT}, + /* WIND */ {IPL, NT, IPH, NT, ITL, NT, ITH, NT}, }; #undef IPL #undef IPH @@ -2436,7 +2436,7 @@ int main(int argc, char *argv[]) } else { - if (c == PT_DRAG) + if (c == PT_WIND) { for (j=-bsy; j<=bsy; j++) for (i=-bsx; i<=bsx; i++) @@ -2472,7 +2472,7 @@ int main(int argc, char *argv[]) { if (sdl_mod & (KMOD_CAPS)) c = 0; - if (c!=WL_STREAM+100&&c!=SPC_AIR&&c!=SPC_HEAT&&c!=SPC_COOL&&c!=SPC_VACUUM&&!REPLACE_MODE&&c!=PT_DRAG) + if (c!=WL_STREAM+100&&c!=SPC_AIR&&c!=SPC_HEAT&&c!=SPC_COOL&&c!=SPC_VACUUM&&!REPLACE_MODE&&c!=PT_WIND) flood_parts(x, y, c, -1, -1); if (c==SPC_HEAT || c==SPC_COOL) create_parts(x, y, bsx, bsy, c); |