diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2011-05-05 19:14:35 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2011-05-05 19:14:35 (GMT) |
| commit | 5aefd0cb01facdda852960c03489991461aaed62 (patch) | |
| tree | 5d6528ecd26bc03ca18f02c1ec5c0eb5e7e7a269 /includes | |
| parent | fb408ab82b8ae7a033899fc25ffcba3813549c54 (diff) | |
| download | powder-5aefd0cb01facdda852960c03489991461aaed62.zip powder-5aefd0cb01facdda852960c03489991461aaed62.tar.gz | |
Initial soap commit
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/powder.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/includes/powder.h b/includes/powder.h index eda3911..3872655 100644 --- a/includes/powder.h +++ b/includes/powder.h @@ -199,7 +199,8 @@ #define PT_BRAN 146 #define PT_WIND 147 #define PT_H2 148 -#define PT_NUM 149 +#define PT_SOAP 149 +#define PT_NUM 150 #define R_TEMP 22 #define MAX_TEMP 9999 @@ -299,6 +300,7 @@ int update_WATR(UPDATE_FUNC_ARGS); int update_WIFI(UPDATE_FUNC_ARGS); int update_WTRV(UPDATE_FUNC_ARGS); int update_YEST(UPDATE_FUNC_ARGS); +int update_SOAP(UPDATE_FUNC_ARGS); int update_O2(UPDATE_FUNC_ARGS); int update_H2(UPDATE_FUNC_ARGS); @@ -316,6 +318,7 @@ struct particle float pavg[2]; int flags; int tmp; + int tmp2; }; typedef struct particle particle; @@ -523,6 +526,7 @@ static const part_type ptypes[PT_NUM] = {"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}, {"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}, {"H2", PIXPACK(0x5070FF), 2.0f, 0.00f * CFDS, 0.99f, 0.30f, -0.10f, 0.00f, 3.00f, 0.000f * CFDS, 0, 0, 0, 0, 0, 1, 1, SC_GAS, R_TEMP+0.0f +273.15f, 251, "Combines with O2 to make WATR", ST_GAS, TYPE_GAS, &update_H2}, + {"SOAP", PIXPACK(0xF5F5DC), 0.6f, 0.01f * CFDS, 0.98f, 0.95f, 0.0f, 0.1f, 0.00f, 0.000f * CFDS, 2, 0, 0, 0, 20, 1, 35, SC_LIQUID, R_TEMP-2.0f +273.15f, 29, "Soap. Creates bubbles.", ST_LIQUID, TYPE_LIQUID|PROP_NEUTPENETRATE, &update_SOAP}, //Name Colour Advec Airdrag Airloss Loss Collid Grav Diffus Hotair Fal Burn Exp Mel Hrd M Weights Section H Ins Description }; @@ -687,6 +691,7 @@ static part_transition ptransitions[PT_NUM] = /* GOL */ {IPL, NT, IPH, NT, ITL, NT, ITH, NT}, /* WIND */ {IPL, NT, IPH, NT, ITL, NT, ITH, NT}, /* H2 */ {IPL, NT, IPH, NT, ITL, NT, ITH, NT}, + /* SOAP */ {IPL, NT, IPH, NT, ITL, NT, ITL, NT}, }; #undef IPL #undef IPH |