From 2b253cf73cb835fd51e409853d7d14669229ee18 Mon Sep 17 00:00:00 2001
From: Cracker64 <cracker642@gmail.com>
Date: Thu, 30 Dec 2010 16:55:02 -0500
Subject: [PATCH] simon update and small SING change to make it betterer.

---
 includes/powder.h |  2 +-
 src/powder.c      | 14 ++++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/includes/powder.h b/includes/powder.h
index f6755c02f..4248a5849 100644
--- a/includes/powder.h
+++ b/includes/powder.h
@@ -406,7 +406,7 @@ static const part_type ptypes[PT_NUM] =
     {"STK2",	PIXPACK(0x000000),	0.5f,	0.00f * CFDS,	0.2f,	1.0f,	0.0f,	0.0f,	0.0f,	0.00f	* CFDS,	0,	0,		0,	0,	0,	1,	50,		SC_SPECIAL,		R_TEMP+14.6f+273.15f,	0,		"Stickman. Don't kill him!", 0, NULL},
     {"BOMB",	PIXPACK(0xFFF288),	0.6f,	0.01f * CFDS,	0.98f,	0.95f,	0.0f,	0.1f,	0.00f,	0.000f	* CFDS,	1,	0,		0,	0,	20,	1,	30,		SC_EXPLOSIVE,	R_TEMP-2.0f	+273.15f,	29,		"Bomb.", TYPE_PART, NULL},
     {"C-5",	PIXPACK(0x2050E0),	0.0f,	0.00f * CFDS,	0.90f,	0.00f,	0.0f,	0.0f,	0.00f,	0.000f	* CFDS,	0,	0,		0,	0,	1,	1,	100,	SC_EXPLOSIVE,	R_TEMP+0.0f	+273.15f,	88,		"Cold explosive", TYPE_SOLID | PROP_NEUTPENETRATE, NULL},
-    {"SING",	PIXPACK(0x242424),	0.7f,	0.02f * CFDS,	0.96f,	0.80f,	0.0f,	0.12f,	0.00f,	-0.001f	* CFDS,	1,	0,		0,	0,	0,	1,	86,		SC_NUCLEAR,		R_TEMP+0.0f	+273.15f,	70,		"Singularity", TYPE_PART, NULL},
+    {"SING",	PIXPACK(0x242424),	0.7f,	0.36f * CFDS,	0.96f,	0.80f,	0.1f,	0.12f,	0.00f,	-0.001f	* CFDS,	1,	0,		0,	0,	0,	1,	86,		SC_NUCLEAR,		R_TEMP+0.0f	+273.15f,	70,		"Singularity", TYPE_PART, NULL},
     {"QRTZ",	PIXPACK(0xAADDDD),	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_SOLIDS,		R_TEMP+0.0f	+273.15f,	3,	"Quartz, breakable mineral. Conducts but becomes brittle at lower temperatures.", TYPE_SOLID| PROP_HOT_GLOW, NULL}, 
     {"PQRT",	PIXPACK(0x88BBBB),	0.4f,	0.04f * CFDS,	0.94f,	0.95f,	-0.1f,	0.27f,	0.00f,	0.000f	* CFDS,	1,	0,		0,	0,	0,	1,	90,	SC_POWDERS,		R_TEMP+0.0f	+273.15f,	3,	"Broken quartz.", TYPE_PART| PROP_HOT_GLOW, NULL}, 
     //Name		Colour		Advec	Airdrag		Airloss	Loss	Collid	Grav	Diffus	Hotair		Fal	Burn		Exp	Mel	Hrd	M	Weights	Section			H						Ins		Description
diff --git a/src/powder.c b/src/powder.c
index 6a67b4915..e9ebf20a6 100644
--- a/src/powder.c
+++ b/src/powder.c
@@ -433,7 +433,13 @@ inline int create_n_parts(int n, int x, int y, float vx, float vy, int t)
 #endif
 {
 	int i, c;
-	
+	n = (n/10);
+	if(n<1){
+		n = 1;
+	}
+	if(n>680){
+		n = 680;
+	}
     if(x<0 || y<0 || x>=XRES || y>=YRES)
         return -1;
 	
@@ -2504,9 +2510,9 @@ void update_particles_i(pixel *vid, int start, int inc)
                             }
 			    if((r&0xFF)==PT_DEUT && (rt+1)>(rand()%1000))
 			    {
-#ifdef SDEUT
+//#ifdef SDEUT
 				    create_n_parts(parts[r>>8].life, x+nx, y+ny, parts[i].vx, parts[i].vy, PT_NEUT);
-#else
+/*#else
 				    create_part(r>>8, x+nx, y+ny, PT_NEUT);
                                     parts[r>>8].vx = 0.25f*parts[r>>8].vx + parts[i].vx;
                                     parts[r>>8].vy = 0.25f*parts[r>>8].vy + parts[i].vy;
@@ -2519,7 +2525,7 @@ void update_particles_i(pixel *vid, int start, int inc)
 				    }
 				    else 
 					    parts[r>>8].type = PT_NONE;
-#endif
+#endif*/
 			    }
                             if((r&0xFF)==PT_GUNP && 15>(rand()%1000))
                                 parts[r>>8].type = PT_DUST;