From 02067b1587821349e80cda5a0b98153c332a69ee Mon Sep 17 00:00:00 2001 From: Philip Date: Fri, 12 Nov 2010 21:14:47 -0500 Subject: [PATCH] Fix movement of fog and fixed life exchange. --- includes/powder.h | 2 +- src/powder.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/powder.h b/includes/powder.h index ad5bc20b4..15848ff04 100644 --- a/includes/powder.h +++ b/includes/powder.h @@ -314,7 +314,7 @@ static const part_type ptypes[PT_NUM] = {"STAN", PIXPACK(0x5000FF), 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, "Stains! (235678/3678)", TYPE_SOLID}, {"CRAC", PIXPACK(0xFFBE30), 0.00f, 0.00f * CFDS, 0.00f, 1.00f, 0.00f, 0.0f, 0.00f, 0.000f * CFDS, 0, 20, 0, 1, 30, 1, 100, SC_SOLIDS, R_TEMP+0.0f +273.15f, 251, "cracker64 - Spongey, Made by himself",TYPE_SOLID}, {"RIME", PIXPACK(0xCCCCCC), 0.00f, 0.00f * CFDS, 0.00f, 1.00f, 0.00f, 0.0f, 0.00f, 0.000f * CFDS, 0, 0, 0, 0, 30, 1, 100, SC_SOLIDS, R_TEMP+0.0f +273.15f, 100, "from FOG",TYPE_SOLID}, - {"FOG", PIXPACK(0xAAAAAA), 0.0f, 0.00f * CFDS, 0.4f, 0.95f, -0.1f, 0.0f, 0.50f, 0.001f * CFDS, 0, 0, 0, 0, 30, 1, 1, SC_GAS, R_TEMP+0.0f +273.15f, 100, "hmmm",TYPE_GAS}, + {"FOG", PIXPACK(0xAAAAAA), 0.8f, 0.00f * CFDS, 0.4f, 0.70f, -0.1f, 0.0f, 0.99f, 0.000f * CFDS, 0, 0, 0, 0, 30, 1, 1, SC_GAS, R_TEMP+0.0f +273.15f, 100, "hmmm",TYPE_GAS}, //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 }; diff --git a/src/powder.c b/src/powder.c index 04999fbd0..fa9f02b3c 100644 --- a/src/powder.c +++ b/src/powder.c @@ -2036,7 +2036,7 @@ void update_particles_i(pixel *vid, int start, int inc) else if(rt==PT_FOG&&parts[r>>8].life>0) { t = parts[i].type = PT_FOG; - parts[i].life = parts[r>>8].life/2; + parts[i].life = parts[r>>8].life; } } }