# HG changeset patch
# User nemo
# Date 1302470734 14400
# Node ID b6140f35735f46f3dd302b47856589c7c7d7757c
# Parent  948da1e50205cd7812060afedfbc423eeed54982
rename gtBomb to gtGrenade, nerf grenade from 50 to 47 pending some flag to indicate pixels in Land[] belonging to current hog to avoid throwing grenades into hogs

diff -r 948da1e50205 -r b6140f35735f hedgewars/GSHandlers.inc
--- a/hedgewars/GSHandlers.inc	Sun Apr 10 14:04:56 2011 -0400
+++ b/hedgewars/GSHandlers.inc	Sun Apr 10 17:25:34 2011 -0400
@@ -380,7 +380,7 @@
     dec(Gear^.Timer);
     if Gear^.Timer = 1000 then // might need adjustments
         case Gear^.Kind of 
-            gtBomb: makeHogsWorry(Gear^.X, Gear^.Y, 50);
+            gtGrenade: makeHogsWorry(Gear^.X, Gear^.Y, 47);
             gtClusterBomb: makeHogsWorry(Gear^.X, Gear^.Y, 20);
             gtWatermelon: makeHogsWorry(Gear^.X, Gear^.Y, 75);
             gtHellishBomb: makeHogsWorry(Gear^.X, Gear^.Y, 90);
@@ -404,7 +404,7 @@
     if Gear^.Timer = 0 then
     begin
         case Gear^.Kind of 
-            gtBomb: doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), 50, Gear^.Hedgehog, EXPLAutoSound);
+            gtGrenade: doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), 47, Gear^.Hedgehog, EXPLAutoSound);
             gtBall: doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), 40, Gear^.Hedgehog, EXPLAutoSound);
             gtClusterBomb: 
                 begin
diff -r 948da1e50205 -r b6140f35735f hedgewars/HHHandlers.inc
--- a/hedgewars/HHHandlers.inc	Sun Apr 10 14:04:56 2011 -0400
+++ b/hedgewars/HHHandlers.inc	Sun Apr 10 17:25:34 2011 -0400
@@ -204,7 +204,7 @@
             end;
 
              case CurAmmoType of
-                      amGrenade: FollowGear:= AddGear(hwRound(lx), hwRound(ly), gtBomb,         0, newDx, newDy, CurWeapon^.Timer);
+                      amGrenade: FollowGear:= AddGear(hwRound(lx), hwRound(ly), gtGrenade,         0, newDx, newDy, CurWeapon^.Timer);
                       amMolotov: FollowGear:= AddGear(hwRound(lx), hwRound(ly), gtMolotov,      0, newDx, newDy, 0);
                   amClusterBomb: FollowGear:= AddGear(hwRound(lx), hwRound(ly), gtClusterBomb,  0, newDx, newDy, CurWeapon^.Timer);
                       amGasBomb: FollowGear:= AddGear(hwRound(lx), hwRound(ly), gtGasBomb,      0, newDx, newDy, CurWeapon^.Timer);
diff -r 948da1e50205 -r b6140f35735f hedgewars/uGears.pas
--- a/hedgewars/uGears.pas	Sun Apr 10 14:04:56 2011 -0400
+++ b/hedgewars/uGears.pas	Sun Apr 10 17:25:34 2011 -0400
@@ -228,7 +228,7 @@
     end;
 
 case Kind of
-     gtBomb,
+     gtGrenade,
      gtClusterBomb,
      gtGasBomb: begin
                 gear^.ImpactSound:= sndGrenadeImpact;
diff -r 948da1e50205 -r b6140f35735f hedgewars/uGearsRender.pas
--- a/hedgewars/uGearsRender.pas	Sun Apr 10 14:04:56 2011 -0400
+++ b/hedgewars/uGearsRender.pas	Sun Apr 10 17:25:34 2011 -0400
@@ -872,7 +872,7 @@
     startX, endX, startY, endY: LongInt;
 begin
     case Gear^.Kind of
-          gtBomb: DrawRotated(sprBomb, x, y, 0, Gear^.DirAngle);
+          gtGrenade: DrawRotated(sprBomb, x, y, 0, Gear^.DirAngle);
       gtSnowball: DrawRotated(sprSnowball, x, y, 0, Gear^.DirAngle);
        gtGasBomb: DrawRotated(sprCheese, x, y, 0, Gear^.DirAngle);
        gtMolotov: DrawRotated(sprMolotov, x, y, 0, Gear^.DirAngle);
diff -r 948da1e50205 -r b6140f35735f hedgewars/uTypes.pas
--- a/hedgewars/uTypes.pas	Sun Apr 10 14:04:56 2011 -0400
+++ b/hedgewars/uTypes.pas	Sun Apr 10 17:25:34 2011 -0400
@@ -86,7 +86,7 @@
             );
 
     // Gears that interact with other Gears and/or Land
-    TGearType = (gtBomb, gtHedgehog, gtShell, gtGrave, gtBee, // 4
+    TGearType = (gtGrenade, gtHedgehog, gtShell, gtGrave, gtBee, // 4
             gtShotgunShot, gtPickHammer, gtRope, gtMine, gtCase, // 9
             gtDEagleShot, gtDynamite, gtClusterBomb, gtCluster, gtShover, // 14
             gtFlame, gtFirePunch, gtATStartGame, gtATSmoothWindCh, // 18