diff -r 16f687fc18e3 -r 209cf0e2fc36 hedgewars/uConsts.pas --- a/hedgewars/uConsts.pas Mon Jan 12 21:49:41 2009 +0000 +++ b/hedgewars/uConsts.pas Mon Jan 12 21:57:41 2009 +0000 @@ -276,7 +276,7 @@ 'Locale', // ptLocale 'Graphics/AmmoMenu', // ptAmmoMenu 'Graphics/Hedgehog', // ptHedgehog - 'Sounds/voices/Default', // ptVoices + 'Sounds/voices', // ptVoices 'Graphics/Hats' // ptHats ); @@ -473,54 +473,53 @@ Soundz: array[TSound] of record FileName: String[19]; Path : TPathType; - id : PMixChunk; end = ( - (FileName: 'grenadeimpact.ogg'; Path: ptSounds; id: nil),// sndGrenadeImpact - (FileName: 'explosion.ogg'; Path: ptSounds; id: nil),// sndExplosion - (FileName: 'throwpowerup.ogg'; Path: ptSounds; id: nil),// sndThrowPowerUp - (FileName: 'throwrelease.ogg'; Path: ptSounds; id: nil),// sndThrowRelease - (FileName: 'splash.ogg'; Path: ptSounds; id: nil),// sndSplash - (FileName: 'shotgunreload.ogg'; Path: ptSounds; id: nil),// sndShotgunReload - (FileName: 'shotgunfire.ogg'; Path: ptSounds; id: nil),// sndShotgunFire - (FileName: 'graveimpact.ogg'; Path: ptSounds; id: nil),// sndGraveImpact - (FileName: 'minetick.ogg'; Path: ptSounds; id: nil),// sndMineTicks - (FileName: 'pickhammer.ogg'; Path: ptSounds; id: nil),// sndPickhammer - (FileName: 'gun.ogg'; Path: ptSounds; id: nil),// sndGun - (FileName: 'ufo.ogg'; Path: ptSounds; id: nil),// sndUFO - (FileName: 'Jump1.ogg'; Path: ptVoices; id: nil),// sndJump1 - (FileName: 'Jump2.ogg'; Path: ptVoices; id: nil),// sndJump2 - (FileName: 'Jump3.ogg'; Path: ptVoices; id: nil),// sndJump3 - (FileName: 'Yessir.ogg'; Path: ptVoices; id: nil),// sndYesSir - (FileName: 'Laugh.ogg'; Path: ptVoices; id: nil),// sndLaugh - (FileName: 'Illgetyou.ogg'; Path: ptVoices; id: nil),// sndIllGetYou - (FileName: 'Incoming.ogg'; Path: ptVoices; id: nil),// sndIncoming - (FileName: 'Missed.ogg'; Path: ptVoices; id: nil),// sndMissed - (FileName: 'Stupid.ogg'; Path: ptVoices; id: nil),// sndStupid - (FileName: 'Firstblood.ogg'; Path: ptVoices; id: nil),// sndFirstBlood - (FileName: 'Boring.ogg'; Path: ptVoices; id: nil),// sndBoring - (FileName: 'Byebye.ogg'; Path: ptVoices; id: nil),// sndByeBye - (FileName: 'Sameteam.ogg'; Path: ptVoices; id: nil),// sndSameTeam - (FileName: 'Nutter.ogg'; Path: ptVoices; id: nil),// sndNutter - (FileName:'Reinforcements.ogg'; Path: ptVoices; id: nil),// sndReinforce - (FileName: 'Traitor.ogg'; Path: ptVoices; id: nil),// sndTraitor - (FileName:'Youllregretthat.ogg';Path: ptVoices; id: nil),// sndRegret - (FileName: 'Enemydown.ogg'; Path: ptVoices; id: nil),// sndEnemyDown - (FileName: 'Coward.ogg'; Path: ptVoices; id: nil),// sndCoward - (FileName: 'Hurry.ogg'; Path: ptVoices; id: nil),// sndHurry - (FileName: 'Watchit.ogg'; Path: ptVoices; id: nil),// sndWatchIt - (FileName: 'Kamikaze.ogg'; Path: ptVoices; id: nil),// sndKamikaze - (FileName: 'cake2.ogg'; Path: ptSounds; id: nil),// sndCake - (FileName: 'Ow1.ogg'; Path: ptVoices; id: nil),// sndOw1 - (FileName: 'Ow4.ogg'; Path: ptVoices; id: nil),// sndOw4 - (FileName: 'Firepunch1.ogg'; Path: ptSounds; id: nil),// sndFirepunch1 - (FileName: 'Firepunch2.ogg'; Path: ptSounds; id: nil),// sndFirepunch2 - (FileName: 'Firepunch3.ogg'; Path: ptSounds; id: nil),// sndFirepunch3 - (FileName: 'Firepunch4.ogg'; Path: ptSounds; id: nil),// sndFirepunch4 - (FileName: 'Firepunch5.ogg'; Path: ptSounds; id: nil),// sndFirepunch5 - (FileName: 'Firepunch6.ogg'; Path: ptSounds; id: nil),// sndFirepunch6 - (FileName: 'Melon.ogg'; Path: ptSounds; id: nil),// sndMelon - (FileName: 'Hellish.ogg'; Path: ptSounds; id: nil),// sndHellish - (FileName: 'Yoohoo.ogg'; Path: ptSounds; id: nil) // sndYoohoo + (FileName: 'grenadeimpact.ogg'; Path: ptSounds),// sndGrenadeImpact + (FileName: 'explosion.ogg'; Path: ptSounds),// sndExplosion + (FileName: 'throwpowerup.ogg'; Path: ptSounds),// sndThrowPowerUp + (FileName: 'throwrelease.ogg'; Path: ptSounds),// sndThrowRelease + (FileName: 'splash.ogg'; Path: ptSounds),// sndSplash + (FileName: 'shotgunreload.ogg'; Path: ptSounds),// sndShotgunReload + (FileName: 'shotgunfire.ogg'; Path: ptSounds),// sndShotgunFire + (FileName: 'graveimpact.ogg'; Path: ptSounds),// sndGraveImpact + (FileName: 'minetick.ogg'; Path: ptSounds),// sndMineTicks + (FileName: 'pickhammer.ogg'; Path: ptSounds),// sndPickhammer + (FileName: 'gun.ogg'; Path: ptSounds),// sndGun + (FileName: 'ufo.ogg'; Path: ptSounds),// sndUFO + (FileName: 'Jump1.ogg'; Path: ptVoices),// sndJump1 + (FileName: 'Jump2.ogg'; Path: ptVoices),// sndJump2 + (FileName: 'Jump3.ogg'; Path: ptVoices),// sndJump3 + (FileName: 'Yessir.ogg'; Path: ptVoices),// sndYesSir + (FileName: 'Laugh.ogg'; Path: ptVoices),// sndLaugh + (FileName: 'Illgetyou.ogg'; Path: ptVoices),// sndIllGetYou + (FileName: 'Incoming.ogg'; Path: ptVoices),// sndIncoming + (FileName: 'Missed.ogg'; Path: ptVoices),// sndMissed + (FileName: 'Stupid.ogg'; Path: ptVoices),// sndStupid + (FileName: 'Firstblood.ogg'; Path: ptVoices),// sndFirstBlood + (FileName: 'Boring.ogg'; Path: ptVoices),// sndBoring + (FileName: 'Byebye.ogg'; Path: ptVoices),// sndByeBye + (FileName: 'Sameteam.ogg'; Path: ptVoices),// sndSameTeam + (FileName: 'Nutter.ogg'; Path: ptVoices),// sndNutter + (FileName:'Reinforcements.ogg'; Path: ptVoices),// sndReinforce + (FileName: 'Traitor.ogg'; Path: ptVoices),// sndTraitor + (FileName:'Youllregretthat.ogg';Path: ptVoices),// sndRegret + (FileName: 'Enemydown.ogg'; Path: ptVoices),// sndEnemyDown + (FileName: 'Coward.ogg'; Path: ptVoices),// sndCoward + (FileName: 'Hurry.ogg'; Path: ptVoices),// sndHurry + (FileName: 'Watchit.ogg'; Path: ptVoices),// sndWatchIt + (FileName: 'Kamikaze.ogg'; Path: ptVoices),// sndKamikaze + (FileName: 'cake2.ogg'; Path: ptSounds),// sndCake + (FileName: 'Ow1.ogg'; Path: ptVoices),// sndOw1 + (FileName: 'Ow4.ogg'; Path: ptVoices),// sndOw4 + (FileName: 'Firepunch1.ogg'; Path: ptSounds),// sndFirepunch1 + (FileName: 'Firepunch2.ogg'; Path: ptSounds),// sndFirepunch2 + (FileName: 'Firepunch3.ogg'; Path: ptSounds),// sndFirepunch3 + (FileName: 'Firepunch4.ogg'; Path: ptSounds),// sndFirepunch4 + (FileName: 'Firepunch5.ogg'; Path: ptSounds),// sndFirepunch5 + (FileName: 'Firepunch6.ogg'; Path: ptSounds),// sndFirepunch6 + (FileName: 'Melon.ogg'; Path: ptSounds),// sndMelon + (FileName: 'Hellish.ogg'; Path: ptSounds),// sndHellish + (FileName: 'Yoohoo.ogg'; Path: ptSounds) // sndYoohoo ); Ammoz: array [TAmmoType] of record