--- a/hedgewars/HHHandlers.inc Fri Mar 07 13:16:11 2008 +0000
+++ b/hedgewars/HHHandlers.inc Fri Mar 07 14:10:13 2008 +0000
@@ -212,6 +212,7 @@
Gear^.dY:= -_0_15;
Gear^.dX:= SignAs(_0_15, Gear^.dX);
Gear^.State:= Gear^.State or gstMoving or gstHHJumping;
+ PlaySound(sndJump1, false);
exit
end;
end;
@@ -225,6 +226,7 @@
Gear^.dY:= -_0_2;
SetLittle(Gear^.dX);
Gear^.State:= Gear^.State or gstMoving or gstHHJumping;
+ PlaySound(sndJump3, false);
exit
end;
end;
@@ -431,7 +433,8 @@
begin
Gear^.State:= Gear^.State or gstHHHJump or gstMoving;
Gear^.dY:= -_0_25;
- Gear^.dX:= -SignAs(_0_02, Gear^.dX)
+ Gear^.dX:= -SignAs(_0_02, Gear^.dX);
+ PlaySound(sndJump2, false)
end;
Gear^.Message:= Gear^.Message and not (gm_LJump or gm_HJump);
--- a/hedgewars/uConsts.pas Fri Mar 07 13:16:11 2008 +0000
+++ b/hedgewars/uConsts.pas Fri Mar 07 14:10:13 2008 +0000
@@ -29,7 +29,7 @@
TPathType = (ptNone, ptData, ptGraphics, ptThemes, ptCurrTheme, ptTeams, ptMaps,
ptMapCurrent, ptDemos, ptSounds, ptGraves, ptFonts, ptForts,
- ptLocale, ptAmmoMenu);
+ ptLocale, ptAmmoMenu, ptVoices);
TSprite = (sprWater, sprCloud, sprBomb, sprBigDigit, sprFrame,
sprLag, sprArrow, sprGrenade, sprTargetP, sprUFO,
@@ -55,7 +55,8 @@
TSound = (sndGrenadeImpact, sndExplosion, sndThrowPowerUp, sndThrowRelease,
sndSplash, sndShotgunReload, sndShotgunFire, sndGraveImpact,
- sndMineTick, sndPickhammer, sndGun, sndUFO);
+ sndMineTick, sndPickhammer, sndGun, sndUFO, sndJump1, sndJump2,
+ sndJump3);
TAmmoType = (amGrenade, amClusterBomb, amBazooka, amUFO, amShotgun, amPickHammer,
amSkip, amRope, amMine, amDEagle, amDynamite, amFirePunch,
@@ -234,7 +235,8 @@
'Fonts', // ptFonts
'Forts', // ptForts
'Locale', // ptLocale
- 'Graphics/AmmoMenu' // ptAmmoMenu
+ 'Graphics/AmmoMenu', // ptAmmoMenu
+ 'Sounds/voices' // ptVoices
);
SpritesData: array[TSprite] of record
@@ -340,24 +342,27 @@
);
Soundz: array[TSound] of record
- FileName: String[31];
- Path : TPathType;
- id : PMixChunk;
- lastChan: LongInt;
- end = (
- (FileName: 'grenadeimpact.ogg'; Path: ptSounds; id: nil; lastChan: 0),// sndGrenadeImpact
- (FileName: 'explosion.ogg'; Path: ptSounds; id: nil; lastChan: 0),// sndExplosion
- (FileName: 'throwpowerup.ogg'; Path: ptSounds; id: nil; lastChan: 0),// sndThrowPowerUp
- (FileName: 'throwrelease.ogg'; Path: ptSounds; id: nil; lastChan: 0),// sndThrowRelease
- (FileName: 'splash.ogg'; Path: ptSounds; id: nil; lastChan: 0),// sndSplash
- (FileName: 'shotgunreload.ogg'; Path: ptSounds; id: nil; lastChan: 0),// sndShotgunReload
- (FileName: 'shotgunfire.ogg'; Path: ptSounds; id: nil; lastChan: 0),// sndShotgunFire
- (FileName: 'graveimpact.ogg'; Path: ptSounds; id: nil; lastChan: 0),// sndGraveImpact
- (FileName: 'minetick.ogg'; Path: ptSounds; id: nil; lastChan: 0),// sndMineTicks
- (FileName: 'pickhammer.ogg'; Path: ptSounds; id: nil; lastChan: 0),// sndPickhammer
- (FileName: 'gun.ogg'; Path: ptSounds; id: nil; lastChan: 0),// sndGun
- (FileName: 'ufo.ogg'; Path: ptSounds; id: nil; lastChan: 0) // sndUFO
- );
+ FileName: String[31];
+ Path : TPathType;
+ id : PMixChunk;
+ lastChan: LongInt;
+ end = (
+ (FileName: 'grenadeimpact.ogg'; Path: ptSounds; id: nil; lastChan: 0),// sndGrenadeImpact
+ (FileName: 'explosion.ogg'; Path: ptSounds; id: nil; lastChan: 0),// sndExplosion
+ (FileName: 'throwpowerup.ogg'; Path: ptSounds; id: nil; lastChan: 0),// sndThrowPowerUp
+ (FileName: 'throwrelease.ogg'; Path: ptSounds; id: nil; lastChan: 0),// sndThrowRelease
+ (FileName: 'splash.ogg'; Path: ptSounds; id: nil; lastChan: 0),// sndSplash
+ (FileName: 'shotgunreload.ogg'; Path: ptSounds; id: nil; lastChan: 0),// sndShotgunReload
+ (FileName: 'shotgunfire.ogg'; Path: ptSounds; id: nil; lastChan: 0),// sndShotgunFire
+ (FileName: 'graveimpact.ogg'; Path: ptSounds; id: nil; lastChan: 0),// sndGraveImpact
+ (FileName: 'minetick.ogg'; Path: ptSounds; id: nil; lastChan: 0),// sndMineTicks
+ (FileName: 'pickhammer.ogg'; Path: ptSounds; id: nil; lastChan: 0),// sndPickhammer
+ (FileName: 'gun.ogg'; Path: ptSounds; id: nil; lastChan: 0),// sndGun
+ (FileName: 'ufo.ogg'; Path: ptSounds; id: nil; lastChan: 0),// sndUFO
+ (FileName: 'Jump1.ogg'; Path: ptVoices; id: nil; lastChan: 0),// sndJump1
+ (FileName: 'Jump2.ogg'; Path: ptVoices; id: nil; lastChan: 0),// sndJump2
+ (FileName: 'Jump3.ogg'; Path: ptVoices; id: nil; lastChan: 0) // sndJump3
+);
Ammoz: array [TAmmoType] of record
NameId: TAmmoStrId;
--- a/share/hedgewars/Data/Sounds/CMakeLists.txt Fri Mar 07 13:16:11 2008 +0000
+++ b/share/hedgewars/Data/Sounds/CMakeLists.txt Fri Mar 07 14:10:13 2008 +0000
@@ -1,3 +1,5 @@
+add_subdirectory(voices)
+
file(GLOB BaseSounds *.ogg)
install(FILES
Binary file share/hedgewars/Data/Sounds/voices/Amazing.ogg has changed
Binary file share/hedgewars/Data/Sounds/voices/Boring.ogg has changed
Binary file share/hedgewars/Data/Sounds/voices/Brilliant.ogg has changed
Binary file share/hedgewars/Data/Sounds/voices/Bugger.ogg has changed
Binary file share/hedgewars/Data/Sounds/voices/Bungee.ogg has changed
Binary file share/hedgewars/Data/Sounds/voices/Byebye.ogg has changed
Binary file share/hedgewars/Data/Sounds/voices/Comeonthen.ogg has changed
Binary file share/hedgewars/Data/Sounds/voices/Coward.ogg has changed
Binary file share/hedgewars/Data/Sounds/voices/Cutitout.ogg has changed
Binary file share/hedgewars/Data/Sounds/voices/Drat.ogg has changed
Binary file share/hedgewars/Data/Sounds/voices/Enemydown.ogg has changed
Binary file share/hedgewars/Data/Sounds/voices/Excellent.ogg has changed
Binary file share/hedgewars/Data/Sounds/voices/Fire.ogg has changed
Binary file share/hedgewars/Data/Sounds/voices/Firstblood.ogg has changed
Binary file share/hedgewars/Data/Sounds/voices/Flawless.ogg has changed
Binary file share/hedgewars/Data/Sounds/voices/Gonnagetyou.ogg has changed
Binary file share/hedgewars/Data/Sounds/voices/Grenade.ogg has changed
Binary file share/hedgewars/Data/Sounds/voices/Hello.ogg has changed
Binary file share/hedgewars/Data/Sounds/voices/Hmm.ogg has changed
Binary file share/hedgewars/Data/Sounds/voices/Hurry.ogg has changed
Binary file share/hedgewars/Data/Sounds/voices/Illgetyou.ogg has changed
Binary file share/hedgewars/Data/Sounds/voices/Incoming.ogg has changed
Binary file share/hedgewars/Data/Sounds/voices/Jump1.ogg has changed
Binary file share/hedgewars/Data/Sounds/voices/Jump2.ogg has changed
Binary file share/hedgewars/Data/Sounds/voices/Jump3.ogg has changed
Binary file share/hedgewars/Data/Sounds/voices/Justyouwait.ogg has changed
Binary file share/hedgewars/Data/Sounds/voices/Kamikaze.ogg has changed
Binary file share/hedgewars/Data/Sounds/voices/Laugh.ogg has changed
Binary file share/hedgewars/Data/Sounds/voices/Leavemealone.ogg has changed
Binary file share/hedgewars/Data/Sounds/voices/Missed.ogg has changed
Binary file share/hedgewars/Data/Sounds/voices/Nooo.ogg has changed
Binary file share/hedgewars/Data/Sounds/voices/Nutter.ogg has changed
Binary file share/hedgewars/Data/Sounds/voices/Ohdear.ogg has changed
Binary file share/hedgewars/Data/Sounds/voices/Oops.ogg has changed
Binary file share/hedgewars/Data/Sounds/voices/Perfect.ogg has changed
Binary file share/hedgewars/Data/Sounds/voices/Reinforcements.ogg has changed
Binary file share/hedgewars/Data/Sounds/voices/Revenge.ogg has changed
Binary file share/hedgewars/Data/Sounds/voices/Runaway.ogg has changed
Binary file share/hedgewars/Data/Sounds/voices/Sameteam.ogg has changed
Binary file share/hedgewars/Data/Sounds/voices/Solong.ogg has changed
Binary file share/hedgewars/Data/Sounds/voices/Stupid.ogg has changed
Binary file share/hedgewars/Data/Sounds/voices/Takecover.ogg has changed
Binary file share/hedgewars/Data/Sounds/voices/Thisoneismine.ogg has changed
Binary file share/hedgewars/Data/Sounds/voices/Traitor.ogg has changed
Binary file share/hedgewars/Data/Sounds/voices/Uh-oh.ogg has changed
Binary file share/hedgewars/Data/Sounds/voices/Victory.ogg has changed
Binary file share/hedgewars/Data/Sounds/voices/Watchit.ogg has changed
Binary file share/hedgewars/Data/Sounds/voices/Watchthis.ogg has changed
Binary file share/hedgewars/Data/Sounds/voices/Whatthe.ogg has changed
Binary file share/hedgewars/Data/Sounds/voices/Whoopsee.ogg has changed
Binary file share/hedgewars/Data/Sounds/voices/Yessir.ogg has changed
Binary file share/hedgewars/Data/Sounds/voices/Youllregretthat.ogg has changed