Mercurial Mercurial > sheepy-clone / 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.
merge
authornemo
Sun, 18 Jan 2015 14:48:23 -0500
changeset 10796 f7cdca3ed697
parent 10794 ace862eda192 (diff)
parent 10795 5672d43e8d88 (current diff)
child 10797 6458fd2f5636
merge
hedgewars/uGearsHandlersMess.pas file | annotate | diff | comparison | revisions 
--- a/hedgewars/uGearsHandlersMess.pas	Sun Jan 18 15:36:36 2015 +0100
+++ b/hedgewars/uGearsHandlersMess.pas	Sun Jan 18 14:48:23 2015 -0500
@@ -1811,6 +1811,7 @@
         end;
     if targ <> nil then
         begin
+        AddVisualGear(hwRound(targ^.X), hwRound(targ^.Y), vgtBubble);
         trackSpeed.QWordValue:= Gear^.Power;
         if (Gear^.X < targ^.X) and (Gear^.dX < _0_1)  then
              Gear^.dX:= Gear^.dX+trackSpeed
@@ -1826,6 +1827,7 @@
         if ((Gear^.State and gstAttacking) = 0) then
             begin
             if ((GameTicks and $1F) = 0) then
+                begin
                 if targ <> nil then
                     begin
                     tX:=Gear^.X-targ^.X;
@@ -1836,6 +1838,7 @@
                     end
                 else if (Gear^.Angle > 0) and (CheckGearNear(Gear, gtHedgehog, Gear^.Karma, Gear^.Karma) <> nil) then
                     Gear^.State := Gear^.State or gstAttacking
+                end
             end
         else // gstAttacking <> 0
             begin
--- a/hedgewars/uGearsList.pas	Sun Jan 18 15:36:36 2015 +0100
+++ b/hedgewars/uGearsList.pas	Sun Jan 18 14:48:23 2015 -0500
@@ -365,7 +365,7 @@
                 gear^.nImpactSounds:= 1;
                 gear^.Health:= 30;
                 gear^.State:= gear^.State or gstMoving or gstNoGravity;
-                gear^.Radius:= 3;
+                gear^.Radius:= 7;
                 gear^.Elasticity:= _0_55;
                 gear^.Friction:= _0_995;
                 gear^.Density:= _1;
--- a/hedgewars/uGearsRender.pas	Sun Jan 18 15:36:36 2015 +0100
+++ b/hedgewars/uGearsRender.pas	Sun Jan 18 14:48:23 2015 -0500
@@ -1120,7 +1120,7 @@
                        DrawSpriteRotated(sprMineOn, x, y, 0, Gear^.DirAngle)
                     else DrawSpriteRotated(sprMineDead, x, y, 0, Gear^.DirAngle);
                     end;
-         gtAirMine:  DrawSpriteRotated(sprMineOff, x, y, 0, 0);
+         gtAirMine: DrawSprite(sprAirMine, x-16, y-16, (RealTicks div 125) mod 16);
 
            gtSMine: if (((Gear^.State and gstAttacking) = 0)or((Gear^.Timer and $3FF) < 420)) and (Gear^.Health <> 0) then
                            DrawSpriteRotated(sprSMineOff, x, y, 0, Gear^.DirAngle)
--- a/hedgewars/uTypes.pas	Sun Jan 18 15:36:36 2015 +0100
+++ b/hedgewars/uTypes.pas	Sun Jan 18 14:48:23 2015 -0500
@@ -87,7 +87,8 @@
             sprHandResurrector, sprCross, sprAirDrill, sprNapalmBomb,
             sprBulletHit, sprSnowball, sprHandSnowball, sprSnow,
             sprSDFlake, sprSDWater, sprSDCloud, sprSDSplash, sprSDDroplet, sprTardis,
-            sprSlider, sprBotlevels, sprHandKnife, sprKnife, sprStar, sprIceTexture, sprIceGun, sprFrozenHog, sprAmRubber, sprBoing, sprCustom1, sprCustom2
+            sprSlider, sprBotlevels, sprHandKnife, sprKnife, sprStar, sprIceTexture, sprIceGun,
+            sprFrozenHog, sprAmRubber, sprBoing, sprCustom1, sprCustom2, sprAirMine
             );
 
     // Gears that interact with other Gears and/or Land
--- a/hedgewars/uVariables.pas	Sun Jan 18 15:36:36 2015 +0100
+++ b/hedgewars/uVariables.pas	Sun Jan 18 14:48:23 2015 -0500
@@ -701,7 +701,9 @@
             (FileName:       'custom1'; Path: ptCurrTheme;AltPath: ptGraphics; Texture: nil; Surface: nil;
             Width:   0; Height:  0; imageWidth: 0; imageHeight: 0; saveSurf: true; priority: tpLow; getDimensions: true; getImageDimensions: true), // sprCustom1
             (FileName:       'custom2'; Path: ptCurrTheme;AltPath: ptGraphics; Texture: nil; Surface: nil;
-            Width:   0; Height:  0; imageWidth: 0; imageHeight: 0; saveSurf: true; priority: tpLow; getDimensions: true; getImageDimensions: true) // sprCustom2
+            Width:   0; Height:  0; imageWidth: 0; imageHeight: 0; saveSurf: true; priority: tpLow; getDimensions: true; getImageDimensions: true), // sprCustom2
+            (FileName:      'AirMine'; Path: ptGraphics; AltPath: ptNone; Texture: nil; Surface: nil;
+            Width:  32; Height: 32; imageWidth: 0; imageHeight: 0; saveSurf: false; priority: tpHighest; getDimensions: false; getImageDimensions: true)// sprAirMine
             );
 
 const
Binary file share/hedgewars/Data/Graphics/AirMine.png has changed
sheepy-clone