# HG changeset patch # User Wuzzy # Date 1540562148 -7200 # Node ID 1670fc3957df451182160a185b7090be3f85a69b # Parent 817dc8b67b0d312de0018512fafefbc1c17865da Add sound for landspray diff -r 817dc8b67b0d -r 1670fc3957df CREDITS --- a/CREDITS Fri Oct 26 15:52:07 2018 +0200 +++ b/CREDITS Fri Oct 26 15:55:48 2018 +0200 @@ -126,6 +126,8 @@ https://www.freesound.org/people/rombart/sounds/197800/ - Flamethrower sound originally by AslakHostaker (CC-0), adapted from https://freesound.org/people/AslakHostaker/sounds/395039/ +- Landspray sound originally by Benboncan (CC BY 3.0), remixed from + https://freesound.org/people/Benboncan/sounds/82390/ - Portable Portal Device color switching sound by Wuzzy (CC-0) - Portable Portal Device shot sound originally by bubaproducer (CC-BY 3.0), remixed from https://www.freesound.org/people/bubaproducer/sounds/151026/ diff -r 817dc8b67b0d -r 1670fc3957df ChangeLog.txt --- a/ChangeLog.txt Fri Oct 26 15:52:07 2018 +0200 +++ b/ChangeLog.txt Fri Oct 26 15:55:48 2018 +0200 @@ -49,6 +49,7 @@ + Campaigns and missions now use the user's chosen custom clan colors + New default brown clan color for better contrast + Allow to change volume during pause + + Add sounds for flamethrower, landspray and idle freezer * Fix extreme amounts of droplets when shooting with minigun into ocean world edge * Fix some flakes disappearing in world wrap worlds while moving camera * Fix invisible projectile timer, attack bar, target on other side of wrap world edge diff -r 817dc8b67b0d -r 1670fc3957df hedgewars/uGearsHandlersMess.pas --- a/hedgewars/uGearsHandlersMess.pas Fri Oct 26 15:52:07 2018 +0200 +++ b/hedgewars/uGearsHandlersMess.pas Fri Oct 26 15:55:48 2018 +0200 @@ -5593,6 +5593,7 @@ HHGear := Gear^.Hedgehog^.Gear; if HHGear = nil then begin + StopSoundChan(gear^.SoundChannel); DeleteGear(gear); exit end; @@ -5639,6 +5640,7 @@ begin HHGear^.Message:= HHGear^.Message and (not gmAttack); HHGear^.State := HHGear^.State and (not gstNotKickable); + StopSoundChan(gear^.SoundChannel); DeleteGear(Gear); AfterAttack end @@ -5662,6 +5664,7 @@ HHGear := Gear^.Hedgehog^.Gear; HHGear^.Message := HHGear^.Message and (not (gmUp or gmDown or gmLeft or gmRight or gmAttack)); HHGear^.State := HHGear^.State or gstNotKickable; + Gear^.SoundChannel := LoopSound(sndLandGun); Gear^.doStep := @doStepLandGunWork end; diff -r 817dc8b67b0d -r 1670fc3957df hedgewars/uSound.pas --- a/hedgewars/uSound.pas Fri Oct 26 15:52:07 2018 +0200 +++ b/hedgewars/uSound.pas Fri Oct 26 15:55:48 2018 +0200 @@ -299,7 +299,8 @@ (FileName: 'custom8.ogg'; Path: ptSounds; AltPath: ptNone),// sndCustom8 (FileName: 'minigun.ogg'; Path: ptSounds; AltPath: ptNone),// sndMinigun (FileName: 'flamethrower.ogg'; Path: ptSounds; AltPath: ptNone),// sndFlamethrower - (FileName: 'ice_beam_idle.ogg'; Path: ptSounds; AltPath: ptNone) // sndIceBeamIdle + (FileName: 'ice_beam_idle.ogg'; Path: ptSounds; AltPath: ptNone),// sndIceBeamIdle + (FileName: 'landgun.ogg'; Path: ptSounds; AltPath: ptNone) // sndLandGun ); diff -r 817dc8b67b0d -r 1670fc3957df hedgewars/uTypes.pas --- a/hedgewars/uTypes.pas Fri Oct 26 15:52:07 2018 +0200 +++ b/hedgewars/uTypes.pas Fri Oct 26 15:55:48 2018 +0200 @@ -151,7 +151,8 @@ sndInvulnerable, sndJetpackLaunch, sndJetpackBoost, sndPortalShot, sndPortalSwitch, sndPortalOpen, sndBlowTorch, sndCountdown1, sndCountdown2, sndCountdown3, sndCountdown4, sndCreeperDrop, sndCreeperWater, sndCreeperDie, sndCustom1, sndCustom2, sndCustom3, sndCustom4, - sndCustom5, sndCustom6, sndCustom7, sndCustom8, sndMinigun, sndFlamethrower, sndIceBeamIdle); + sndCustom5, sndCustom6, sndCustom7, sndCustom8, sndMinigun, sndFlamethrower, sndIceBeamIdle, + sndLandGun); // Available ammo types to be used by hedgehogs TAmmoType = (amNothing, amGrenade, amClusterBomb, amBazooka, amBee, amShotgun, amPickHammer, // 6