# HG changeset patch # User nemo # Date 1255620499 0 # Node ID 5affd0840927fbede7c965b506b2363650efca5e # Parent 30bdedacec0dcd3df5c24dbc0c5696f4ef6adb4f New data files from Tiy, add gtFlame to avoidance list diff -r 30bdedacec0d -r 5affd0840927 hedgewars/uGears.pas --- a/hedgewars/uGears.pas Thu Oct 15 13:51:11 2009 +0000 +++ b/hedgewars/uGears.pas Thu Oct 15 15:28:19 2009 +0000 @@ -1960,7 +1960,7 @@ if (y - sy > Gear^.Radius * 2) and (y < LAND_HEIGHT) - and (CheckGearsNear(x, y - Gear^.Radius, [gtHedgehog, gtMine, gtCase], 110, 110) = nil) then + and (CheckGearsNear(x, y - Gear^.Radius, [gtFlame, gtHedgehog, gtMine, gtCase], 110, 110) = nil) then begin ar[cnt].X:= x; if withFall then ar[cnt].Y:= sy + Gear^.Radius @@ -2005,4 +2005,4 @@ finalization FreeGearsList; -end. \ No newline at end of file +end. diff -r 30bdedacec0d -r 5affd0840927 share/hedgewars/Data/Graphics/Graves/Cherry.png Binary file share/hedgewars/Data/Graphics/Graves/Cherry.png has changed diff -r 30bdedacec0d -r 5affd0840927 share/hedgewars/Data/Graphics/Graves/Duck2.png Binary file share/hedgewars/Data/Graphics/Graves/Duck2.png has changed diff -r 30bdedacec0d -r 5affd0840927 share/hedgewars/Data/Graphics/Graves/Earth.png Binary file share/hedgewars/Data/Graphics/Graves/Earth.png has changed diff -r 30bdedacec0d -r 5affd0840927 share/hedgewars/Data/Graphics/Graves/Plinko.png Binary file share/hedgewars/Data/Graphics/Graves/Plinko.png has changed diff -r 30bdedacec0d -r 5affd0840927 share/hedgewars/Data/Graphics/Graves/Rubberduck.png Binary file share/hedgewars/Data/Graphics/Graves/Rubberduck.png has changed diff -r 30bdedacec0d -r 5affd0840927 share/hedgewars/Data/Graphics/Graves/bp2.png Binary file share/hedgewars/Data/Graphics/Graves/bp2.png has changed diff -r 30bdedacec0d -r 5affd0840927 share/hedgewars/Data/Graphics/Graves/bubble.png Binary file share/hedgewars/Data/Graphics/Graves/bubble.png has changed diff -r 30bdedacec0d -r 5affd0840927 share/hedgewars/Data/Graphics/Graves/chest.png Binary file share/hedgewars/Data/Graphics/Graves/chest.png has changed diff -r 30bdedacec0d -r 5affd0840927 share/hedgewars/Data/Graphics/Graves/heart.png Binary file share/hedgewars/Data/Graphics/Graves/heart.png has changed diff -r 30bdedacec0d -r 5affd0840927 share/hedgewars/Data/Graphics/Graves/mouton1.png Binary file share/hedgewars/Data/Graphics/Graves/mouton1.png has changed diff -r 30bdedacec0d -r 5affd0840927 share/hedgewars/Data/Graphics/Graves/plant2.png Binary file share/hedgewars/Data/Graphics/Graves/plant2.png has changed diff -r 30bdedacec0d -r 5affd0840927 share/hedgewars/Data/Graphics/Graves/plant3.png Binary file share/hedgewars/Data/Graphics/Graves/plant3.png has changed diff -r 30bdedacec0d -r 5affd0840927 share/hedgewars/Data/Graphics/Graves/skull.png Binary file share/hedgewars/Data/Graphics/Graves/skull.png has changed diff -r 30bdedacec0d -r 5affd0840927 share/hedgewars/Data/Graphics/Hats/Coonskin3.png Binary file share/hedgewars/Data/Graphics/Hats/Coonskin3.png has changed diff -r 30bdedacec0d -r 5affd0840927 share/hedgewars/Data/Graphics/Hats/Geordi.png Binary file share/hedgewars/Data/Graphics/Hats/Geordi.png has changed diff -r 30bdedacec0d -r 5affd0840927 share/hedgewars/Data/Graphics/Hats/Sniper.png Binary file share/hedgewars/Data/Graphics/Hats/Sniper.png has changed diff -r 30bdedacec0d -r 5affd0840927 share/hedgewars/Data/Graphics/Hats/mickey_ears.png Binary file share/hedgewars/Data/Graphics/Hats/mickey_ears.png has changed diff -r 30bdedacec0d -r 5affd0840927 share/hedgewars/Data/Themes/Halloween/BlueWater.png Binary file share/hedgewars/Data/Themes/Halloween/BlueWater.png has changed diff -r 30bdedacec0d -r 5affd0840927 share/hedgewars/Data/Themes/Halloween/horizont.png Binary file share/hedgewars/Data/Themes/Halloween/horizont.png has changed diff -r 30bdedacec0d -r 5affd0840927 share/hedgewars/Data/Themes/Island/Sky.png Binary file share/hedgewars/Data/Themes/Island/Sky.png has changed diff -r 30bdedacec0d -r 5affd0840927 share/hedgewars/Data/Themes/Island/horizont.png Binary file share/hedgewars/Data/Themes/Island/horizont.png has changed diff -r 30bdedacec0d -r 5affd0840927 share/hedgewars/Data/Themes/Island/theme.cfg --- a/share/hedgewars/Data/Themes/Island/theme.cfg Thu Oct 15 13:51:11 2009 +0000 +++ b/share/hedgewars/Data/Themes/Island/theme.cfg Thu Oct 15 15:28:19 2009 +0000 @@ -1,7 +1,8 @@ 21 20 38 128 0 0 $54 $5C $9D -$34 $3C $7D $80 +$34 $3C $7D +$80 pirate.ogg 9 5 diff -r 30bdedacec0d -r 5affd0840927 share/hedgewars/Data/Themes/nature/Flake.png Binary file share/hedgewars/Data/Themes/nature/Flake.png has changed diff -r 30bdedacec0d -r 5affd0840927 share/hedgewars/Data/Themes/nature/Sky.png Binary file share/hedgewars/Data/Themes/nature/Sky.png has changed diff -r 30bdedacec0d -r 5affd0840927 share/hedgewars/Data/Themes/nature/horizont.png Binary file share/hedgewars/Data/Themes/nature/horizont.png has changed diff -r 30bdedacec0d -r 5affd0840927 share/hedgewars/Data/Themes/themes.cfg --- a/share/hedgewars/Data/Themes/themes.cfg Thu Oct 15 13:51:11 2009 +0000 +++ b/share/hedgewars/Data/Themes/themes.cfg Thu Oct 15 15:28:19 2009 +0000 @@ -8,7 +8,8 @@ Halloween hell Island +nature Sheep Snow -nature Underwater +Compost \ No newline at end of file