# HG changeset patch # User Wuzzy # Date 1570812116 -7200 # Node ID a18f7e4681b84b3233131c53a8300094a3dda50a # Parent 25a5a0f86928903aa0c2263adc2d32249086130a Add flame-less dynamite sprite for drowning dynamite diff -r 25a5a0f86928 -r a18f7e4681b8 hedgewars/uGearsRender.pas --- a/hedgewars/uGearsRender.pas Fri Oct 11 16:56:02 2019 +0200 +++ b/hedgewars/uGearsRender.pas Fri Oct 11 18:41:56 2019 +0200 @@ -1510,7 +1510,10 @@ DrawSpriteRotatedF(sprExplosivesRoll, x, y + 4, 1, 0, Gear^.DirAngle) end; gtDynamite: begin - DrawSprite(sprDynamite, x - 16, y - 25, Gear^.Tag and 1, Gear^.Tag shr 1); + if ((Gear^.State and gstDrowning) = 0) then + DrawSprite(sprDynamite, x - 16, y - 25, Gear^.Tag and 1, Gear^.Tag shr 1) + else + DrawSprite(sprDynamiteDefused, x - 16, y - 25, Gear^.Tag and 1, Gear^.Tag shr 1); if (random(3) = 0) and ((Gear^.State and gstDrowning) = 0) then begin vg:= AddVisualGear(hwRound(Gear^.X)+12-(Gear^.Tag shr 1), hwRound(Gear^.Y)-16, vgtStraightShot); diff -r 25a5a0f86928 -r a18f7e4681b8 hedgewars/uTypes.pas --- a/hedgewars/uTypes.pas Fri Oct 11 16:56:02 2019 +0200 +++ b/hedgewars/uTypes.pas Fri Oct 11 18:41:56 2019 +0200 @@ -94,8 +94,8 @@ sprFlakeL, sprSDFlakeL, sprCloudL, sprSDCloudL, sprCreeper, sprHandCreeper, sprMinigun, sprSliderInverted, sprFingerBack, sprFingerBackInv, sprTargetPBack, sprTargetPBackInv, sprHealthHud, sprHealthPoisonHud, sprVampHud, sprKarmaHud, sprMedicHud, sprMedicPoisonHud, - sprHaloHud, sprInvulnHUD, sprAmPiano, sprHandLandGun, sprFirePunch, sprThroughWrap - ); + sprHaloHud, sprInvulnHUD, sprAmPiano, sprHandLandGun, sprFirePunch, sprThroughWrap, + sprDynamiteDefused); // Gears that interact with other Gears and/or Land // first row of gears (