From 53d2c2d42ff95131351b055af0af5372549062e4 Mon Sep 17 00:00:00 2001
From: Bryan Hoyle <starfoxprime@gmail.com>
Date: Tue, 16 Aug 2011 15:18:15 -0400
Subject: GBMB changes


diff --git a/src/elements/gbmb.c b/src/elements/gbmb.c
index 20582af..f8a461e 100644
--- a/src/elements/gbmb.c
+++ b/src/elements/gbmb.c
@@ -9,12 +9,15 @@ int update_GBMB(UPDATE_FUNC_ARGS) {
 				   (r&0xFF)!=PT_GBMB&&
 				   (r&0xFF)!=PT_CLNE&&
 				   (r&0xFF)!=PT_PCLN&&
+				   (r&0xFF)!=PT_DMND&&
 				   !parts[i].tmp){					
-					parts[i].life=100;
+					parts[i].life=60;
 					parts[i].tmp = 1;
 				}
 				}
-	if(parts[i].life>1)
-	gravmap[y/CELL][x/CELL] = -20;
+	if(parts[i].life>20)
+	gravmap[y/CELL][x/CELL] = 20;
+	if(parts[i].life<20 && parts[i].life>=1)
+	gravmap[y/CELL][x/CELL] = -80;
 return 0;
 }
diff --git a/src/graphics.c b/src/graphics.c
index b3c7231..ca92f53 100644
--- a/src/graphics.c
+++ b/src/graphics.c
@@ -3252,9 +3252,9 @@ void draw_parts(pixel *vid)
 					x = nx/CELL;
 					y = ny/CELL;
 					if (parts[i].tmp==1) {
-					fire_r[y][x] = (int)((float)parts[i].life/100.0 * 25);
-					fire_g[y][x] = (int)((float)parts[i].life/100.0 * 50);
-					fire_b[y][x] = (int)((float)parts[i].life/100.0 * 255);
+					fire_r[y][x] = (int)((float)parts[i].life/60.0 * 25);
+					fire_g[y][x] = (int)((float)parts[i].life/60.0 * 50);
+					fire_b[y][x] = (int)((float)parts[i].life/60.0 * 255);
 						}
 						else
 						{
--
cgit v0.9.2-21-gd62e