Mercurial Mercurial > hedgewars / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
authornemo
Sun, 10 Apr 2011 17:25:34 -0400
changeset 5137 b6140f35735f
parent 5136 948da1e50205
child 5138 f991f87969ff
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
hedgewars/GSHandlers.inc file | annotate | diff | comparison | revisions
hedgewars/HHHandlers.inc file | annotate | diff | comparison | revisions
hedgewars/uGears.pas file | annotate | diff | comparison | revisions
hedgewars/uGearsRender.pas file | annotate | diff | comparison | revisions
hedgewars/uTypes.pas file | annotate | diff | comparison | revisions 
--- 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
--- 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);
--- 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;
--- 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);
--- 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
hedgewars