diff options
| author | Cracker64 <cracker642@gmail.com> | 2010-12-10 19:05:06 (GMT) |
|---|---|---|
| committer | Cracker64 <cracker642@gmail.com> | 2010-12-10 19:05:06 (GMT) |
| commit | 95c4e49f53cc5da31a3bfef3e3ee957b824e08d6 (patch) | |
| tree | 987fc5c09da1c9ffb81c823db3002893b768313a /includes | |
| parent | d017764fbef66fffa058a79d0e3d569f75121a1e (diff) | |
| download | powder-95c4e49f53cc5da31a3bfef3e3ee957b824e08d6.zip powder-95c4e49f53cc5da31a3bfef3e3ee957b824e08d6.tar.gz | |
Lots of small changes/fixes mentioned in my mod post.
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/defines.h | 1 | ||||
| -rw-r--r-- | includes/powder.h | 12 |
2 files changed, 5 insertions, 8 deletions
diff --git a/includes/defines.h b/includes/defines.h index 59559a0..fb52c2e 100644 --- a/includes/defines.h +++ b/includes/defines.h @@ -136,6 +136,7 @@ int REPLACE_MODE; int CURRENT_BRUSH; int GRID_MODE; int VINE_MODE; +int DEBUG_MODE; extern sign signs[MAXSIGNS]; extern stamp stamps[STAMP_MAX]; extern int stamp_count; diff --git a/includes/powder.h b/includes/powder.h index f42fcbc..589932c 100644 --- a/includes/powder.h +++ b/includes/powder.h @@ -173,10 +173,9 @@ #define PT_LOLZ 123 #define PT_WIFI 124 #define PT_FILT 125 -#define PT_XEON 126//radioactive gas -#define PT_ARAY 127 -#define PT_BRAY 128 -#define PT_NUM 129 +#define PT_ARAY 126 +#define PT_BRAY 127 +#define PT_NUM 128 #define R_TEMP 22 #define MAX_TEMP 9999 @@ -393,11 +392,9 @@ static const part_type ptypes[PT_NUM] = {"LOLZ", PIXPACK(0x569212), 0.0f, 0.00f * CFDS, 0.00f, 0.00f, 0.0f, 0.0f, 0.0f, 0.000f * CFDS, 0, 0, 0, 0, 0, 1, 100, SC_CRACKER2, 373.0f, 40, "Lolz", TYPE_SOLID}, {"WIFI", PIXPACK(0x40A060), 0.0f, 0.00f * CFDS, 0.90f, 0.00f, 0.0f, 0.0f, 0.00f, 0.000f * CFDS, 0, 0, 0, 1, 1, 1, 100, SC_ELEC, R_TEMP+0.0f +273.15f, 0, "Wireless transmitter, color coded.", TYPE_SOLID}, {"FILT", PIXPACK(0x000056), 0.0f, 0.00f * CFDS, 0.90f, 0.00f, 0.0f, 0.0f, 0.00f, 0.000f * CFDS, 0, 0, 0, 1, 1, 1, 100, SC_SOLIDS, R_TEMP+0.0f +273.15f, 251, "Filter for photons, changes the color.", TYPE_SOLID}, - {"XEON", PIXPACK(0xEB7917), 1.0f, 0.01f * CFDS, 0.99f, 0.30f, -0.1f, 0.0f, 0.75f, 0.001f * CFDS, 0, 0, 0, 0, 1, 1, 1, SC_CRACKER2, R_TEMP+2.0f +273.15f, 106, "Radioactive gas, absorbs neutrons.", TYPE_GAS}, {"ARAY", PIXPACK(0xFFBB00), 0.0f, 0.00f * CFDS, 0.90f, 0.00f, 0.0f, 0.0f, 0.00f, 0.000f * CFDS, 0, 0, 0, 1, 1, 1, 100, SC_ELEC, R_TEMP+0.0f +273.15f, 251, "Ray Emmitter. Rays create points when they collide", TYPE_SOLID}, {"BRAY", PIXPACK(0xFFFFFF), 0.0f, 0.00f * CFDS, 0.90f, 0.00f, 0.0f, 0.0f, 0.00f, 0.000f * CFDS, 0, 0, 0, 1, 1, 0, 100, SC_ELEC, R_TEMP+0.0f +273.15f, 251, "Ray Point. Rays create points when they collide", TYPE_SOLID} //Name Colour Advec Airdrag Airloss Loss Collid Grav Diffus Hotair Fal Burn Exp Mel Hrd M Weights Section H Ins Description -//Name Colour Advec Airdrag Airloss Loss Collid Grav Diffus Hotair Fal Burn Exp Mel Hrd M Weights Section H Ins(real world, by triclops200) Description }; static part_state pstates[PT_NUM] = @@ -529,7 +526,6 @@ static part_state pstates[PT_NUM] = /* LOlZ */ {ST_GAS, PT_NONE, 0.0f, PT_NONE, 0.0f, PT_NONE, 0.0f, PT_NONE, 0.0f}, /* WIFI */ {ST_SOLID, PT_NONE, 0.0f, PT_NONE, 0.0f, PT_NONE, 0.0f, PT_NONE, 0.0f}, /* FILT */ {ST_SOLID, PT_NONE, 0.0f, PT_NONE, 0.0f, PT_NONE, 0.0f, PT_NONE, 0.0f}, - /* RGAS */ {ST_GAS, PT_NONE, 0.0f, PT_NONE, 0.0f, PT_NONE, 0.0f, PT_NONE, 0.0f}, /* ARAY */ {ST_SOLID, PT_NONE, 0.0f, PT_NONE, 0.0f, PT_NONE, 0.0f, PT_NONE, 0.0f}, /* BRAY */ {ST_SOLID, PT_NONE, 0.0f, PT_NONE, 0.0f, PT_NONE, 0.0f, PT_NONE, 0.0f} @@ -577,7 +573,7 @@ static int lolzrule[9][9] = }; int portal[8][8]; float portaltemp[8][8]; -int wireless[25][2]; +int wireless[MAX_TEMP/100][2]; extern int isplayer; extern float player[27]; |