# HG changeset patch # User unc0rr # Date 1207415186 0 # Node ID 5687fa57a6c1f1c7c5eaa967aff6c8a4ed0ac343 # Parent 8f25b837d3187347cae812b0fae2281fa17271bc - Use baseball-in-hand sprite - Use pickhammer idle sprite diff -r 8f25b837d318 -r 5687fa57a6c1 hedgewars.kdevelop --- a/hedgewars.kdevelop Wed Apr 02 10:46:54 2008 +0000 +++ b/hedgewars.kdevelop Sat Apr 05 17:06:26 2008 +0000 @@ -18,20 +18,20 @@ <projectname>hedgewars</projectname> <projectdirectory>.</projectdirectory> <absoluteprojectpath>false</absoluteprojectpath> - <description></description> + <description/> <versioncontrol>kdevsubversion</versioncontrol> - <defaultencoding></defaultencoding> + <defaultencoding/> </general> <kdevcustomproject> <run> <directoryradio>executable</directoryradio> <customdirectory>/</customdirectory> <mainprogram>bin/hedgewars</mainprogram> - <programargs></programargs> + <programargs/> <terminal>false</terminal> <autocompile>true</autocompile> <envvars/> - <globaldebugarguments></globaldebugarguments> + <globaldebugarguments/> <globalcwd>/usr/home/unC0Rr/Sources/Hedgewars/Hedgewars-GNA</globalcwd> <useglobalprogram>false</useglobalprogram> <autoinstall>false</autoinstall> @@ -98,16 +98,16 @@ </general> <build> <buildtool>make</buildtool> - <builddir></builddir> + <builddir/> </build> <make> <abortonerror>true</abortonerror> <numberofjobs>1</numberofjobs> <prio>0</prio> <dontact>false</dontact> - <makebin></makebin> - <defaulttarget></defaulttarget> - <makeoptions></makeoptions> + <makebin/> + <defaulttarget/> + <makeoptions/> <selectedenvironment>default</selectedenvironment> <environments> <default/> @@ -115,9 +115,9 @@ </make> <other> <prio>0</prio> - <otherbin></otherbin> - <defaulttarget></defaulttarget> - <otheroptions></otheroptions> + <otherbin/> + <defaulttarget/> + <otheroptions/> <selectedenvironment>default</selectedenvironment> <environments> <default/> @@ -126,12 +126,12 @@ </kdevcustomproject> <kdevdebugger> <general> - <dbgshell></dbgshell> + <dbgshell/> <programargs/> - <gdbpath></gdbpath> - <configGdbScript></configGdbScript> - <runShellScript></runShellScript> - <runGdbScript></runGdbScript> + <gdbpath/> + <configGdbScript/> + <runShellScript/> + <runGdbScript/> <breakonloadinglibs>true</breakonloadinglibs> <separatetty>false</separatetty> <floatingtoolbar>false</floatingtoolbar> @@ -237,7 +237,7 @@ <includeTypedefs>false</includeTypedefs> </codecompletion> <creategettersetter> - <prefixGet></prefixGet> + <prefixGet/> <prefixSet>set</prefixSet> <prefixVariable>m_,_</prefixVariable> <parameterName>theValue</parameterName> @@ -256,7 +256,7 @@ <hidenonlocation>false</hidenonlocation> </groups> <tree> - <hidepatterns/> + <hidepatterns></hidepatterns> <hidenonprojectfiles>true</hidenonprojectfiles> <showvcsfields>false</showvcsfields> </tree> @@ -269,13 +269,13 @@ </cppsupportpart> <kdevdocumentation> <projectdoc> - <docsystem></docsystem> - <docurl></docurl> - <usermanualurl></usermanualurl> + <docsystem/> + <docurl/> + <usermanualurl/> </projectdoc> </kdevdocumentation> <ctagspart> - <customArguments></customArguments> + <customArguments/> <customTagfilePath>/usr/home/unC0Rr/Sources/Hedgewars/Hedgewars-GNA/tags</customTagfilePath> <activeTagsFiles/> </ctagspart> diff -r 8f25b837d318 -r 5687fa57a6c1 hedgewars/uConsts.pas --- a/hedgewars/uConsts.pas Wed Apr 02 10:46:54 2008 +0000 +++ b/hedgewars/uConsts.pas Sat Apr 05 17:06:26 2008 +0000 @@ -42,7 +42,7 @@ sprSwitch, sprParachute, sprTarget, sprRopeNode, sprConsoleBG, sprQuestion, sprPowerBar, sprWindBar, sprWindL, sprWindR, sprFlake, sprHandRope, sprHandBazooka, sprHandShotgun, - sprHandDEagle, sprHandAirAttack); + sprHandDEagle, sprHandAirAttack, sprHandBaseball); TGearType = (gtAmmo_Bomb, gtHedgehog, gtAmmo_Grenade, gtHealthTag, gtGrave, gtUFO, gtShotgunShot, gtPickHammer, gtRope, @@ -355,7 +355,9 @@ (FileName: 'amDEagle'; Path: ptHedgehog; AltPath: ptNone; Texture: nil; Surface: nil; Width: 32; Height: 32; saveSurf: false),// sprHandDEagle (FileName:'amAirAttack'; Path: ptHedgehog; AltPath: ptNone; Texture: nil; Surface: nil; - Width: 32; Height: 32; saveSurf: false) // sprHandAirAttack + Width: 32; Height: 32; saveSurf: false),// sprHandAirAttack + (FileName: 'amBaseball'; Path: ptHedgehog; AltPath: ptNone; Texture: nil; Surface: nil; + Width: 32; Height: 32; saveSurf: false) // sprHandBaseball ); Soundz: array[TSound] of record diff -r 8f25b837d318 -r 5687fa57a6c1 hedgewars/uGears.pas --- a/hedgewars/uGears.pas Wed Apr 02 10:46:54 2008 +0000 +++ b/hedgewars/uGears.pas Sat Apr 05 17:06:26 2008 +0000 @@ -528,18 +528,24 @@ amBazooka, amRope, amShotgun, - amDEagle: begin + amDEagle, + amBaseballBat: begin DrawHedgehog(hwRound(Gear^.X) + 1 + WorldDx, hwRound(Gear^.Y) - 3 + WorldDy, hwSign(Gear^.dX), 0, 4, 0); - defaultPos:= false end; amAirAttack, amMineStrike: begin DrawRotated(sprHandAirAttack, hwRound(Gear^.X) + 1 + WorldDx, hwRound(Gear^.Y) + WorldDy, hwSign(Gear^.dX), 0); - defaultPos:= false + end; + amPickHammer: begin + DrawHedgehog(hwRound(Gear^.X) + 1 + WorldDx, hwRound(Gear^.Y) - 3 + WorldDy, + hwSign(Gear^.dX), + 1, + 2, + 0); end; else DrawHedgehog(hwRound(Gear^.X) + 1 + WorldDx, hwRound(Gear^.Y) - 3 + WorldDy, @@ -547,8 +553,15 @@ 0, 3, 0); - defaultPos:= false - end + end; + + case amt of + amBaseballBat: DrawRotated(sprHandBaseball, + hwRound(Gear^.X) + 1 - 4 * hwSign(Gear^.dX) + WorldDx, + hwRound(Gear^.Y) + 6 + WorldDy, hwSign(Gear^.dX), aangle); + end; + + defaultPos:= false end end; diff -r 8f25b837d318 -r 5687fa57a6c1 share/hedgewars/Data/Graphics/Hedgehog.png Binary file share/hedgewars/Data/Graphics/Hedgehog.png has changed diff -r 8f25b837d318 -r 5687fa57a6c1 share/hedgewars/Data/Graphics/Hedgehog/amBaseball.png Binary file share/hedgewars/Data/Graphics/Hedgehog/amBaseball.png has changed