# HG changeset patch # User Urbertar@gmail.com # Date 1361640842 -7200 # Node ID 84a279d0556c2934a8ad69e12981465dacfac21d # Parent 32da16da4e2ae1ff249c3edd056c5f2d1e2d369a Add change ice gun image diff -r 32da16da4e2a -r 84a279d0556c hedgewars/uGearsRender.pas --- a/hedgewars/uGearsRender.pas Sat Feb 23 19:33:26 2013 +0200 +++ b/hedgewars/uGearsRender.pas Sat Feb 23 19:34:02 2013 +0200 @@ -538,7 +538,7 @@ DrawTextureCentered(sx, sy - 40, CurAmmoGear^.Tex) end; gtIceGun: - begin DrawSpriteRotated(sprHandBallgun, hx, hy, sign, aangle); + begin DrawSpriteRotated(sprIceGun, hx, hy, sign, aangle); if CurAmmoGear^.Tex <> nil then DrawTextureCentered(sx, sy - 40, CurAmmoGear^.Tex) end; @@ -669,7 +669,7 @@ amBee: DrawSpriteRotatedF(sprHandBee, hx, hy, (RealTicks div 125) mod 4, sign, aangle); amFlamethrower: DrawSpriteRotatedF(sprHandFlamethrower, hx, hy, (RealTicks div 125) mod 4, sign, aangle); amLandGun: DrawSpriteRotated(sprHandBallgun, hx, hy, sign, aangle); - amIceGun: DrawSpriteRotated(sprHandBallgun, hx, hy, sign, aangle); + amIceGun: DrawSpriteRotated(sprIceGun, hx, hy, sign, aangle); amResurrector: DrawCircle(ox, oy, 98, 4, $F5, $DB, $35, $AA); // I'd rather not like to hardcode 100 here end; diff -r 32da16da4e2a -r 84a279d0556c hedgewars/uTypes.pas --- a/hedgewars/uTypes.pas Sat Feb 23 19:33:26 2013 +0200 +++ b/hedgewars/uTypes.pas Sat Feb 23 19:34:02 2013 +0200 @@ -86,7 +86,7 @@ sprHandResurrector, sprCross, sprAirDrill, sprNapalmBomb, sprBulletHit, sprSnowball, sprHandSnowball, sprSnow, sprSDFlake, sprSDWater, sprSDCloud, sprSDSplash, sprSDDroplet, sprTardis, - sprSlider, sprBotlevels, sprHandKnife, sprKnife, sprStar, sprIceTexture + sprSlider, sprBotlevels, sprHandKnife, sprKnife, sprStar, sprIceTexture, sprIceGun ); // Gears that interact with other Gears and/or Land diff -r 32da16da4e2a -r 84a279d0556c hedgewars/uVariables.pas --- a/hedgewars/uVariables.pas Sat Feb 23 19:33:26 2013 +0200 +++ b/hedgewars/uVariables.pas Sat Feb 23 19:34:02 2013 +0200 @@ -665,7 +665,9 @@ (FileName: 'star'; Path: ptGraphics; AltPath: ptNone; Texture: nil; Surface: nil; Width: 12; Height: 12; imageWidth: 12; imageHeight: 12; saveSurf: false; priority: tpLow; getDimensions: false; getImageDimensions: false), // sprStar (FileName: 'icetexture'; Path: ptGraphics; AltPath: ptNone; Texture: nil; Surface: nil; - Width: 32; Height: 32; imageWidth: 32; imageHeight: 32; saveSurf: true; priority: tpLow; getDimensions: false; getImageDimensions: true) // sprIceTexture + Width: 32; Height: 32; imageWidth: 32; imageHeight: 32; saveSurf: true; priority: tpLow; getDimensions: false; getImageDimensions: true), // sprIceTexture + (FileName: 'amIceGun'; Path: ptHedgehog; AltPath: ptNone; Texture: nil; Surface: nil; + Width: 64; Height: 64; imageWidth: 64; imageHeight: 64; saveSurf: false; priority: tpLow; getDimensions: false; getImageDimensions: false) // sprIceGun ); const diff -r 32da16da4e2a -r 84a279d0556c share/hedgewars/Data/Graphics/Hedgehog/amIceGun.png Binary file share/hedgewars/Data/Graphics/Hedgehog/amIceGun.png has changed