One more sound
authorunc0rr
Fri, 25 Apr 2008 20:41:23 +0000
changeset 873 9bec5af9b23c
parent 872 d5f32e2dc166
child 874 964c0d5b3604
One more sound
doc/SoundsMapping.txt
hedgewars.kdevelop
hedgewars/uConsts.pas
hedgewars/uStats.pas
--- a/doc/SoundsMapping.txt	Fri Apr 25 16:09:20 2008 +0000
+++ b/doc/SoundsMapping.txt	Fri Apr 25 20:41:23 2008 +0000
@@ -40,7 +40,7 @@
  + traitor - when you hit your own team
 uh oh - when an enemy hog stands near you with a baseball bat
 Victory - when you win the match
-watch it - when you hit your own team
+ + watch it - when you hit your own team
 watch this - when you throw a cluster bomb/grenade/bazooka
 what the - when a grenade lands nearby
 whoopsee - when you take fall damage
--- a/hedgewars.kdevelop	Fri Apr 25 16:09:20 2008 +0000
+++ b/hedgewars.kdevelop	Fri Apr 25 20:41:23 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>4</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>
--- a/hedgewars/uConsts.pas	Fri Apr 25 16:09:20 2008 +0000
+++ b/hedgewars/uConsts.pas	Fri Apr 25 20:41:23 2008 +0000
@@ -63,7 +63,7 @@
                    sndJump3, sndYesSir, sndLaugh, sndIllGetYou, sndIncoming,
                    sndMissed, sndStupid, sndFirstBlood, sndBoring, sndByeBye,
                    sndSameTeam, sndNutter, sndReinforce, sndTraitor, sndRegret,
-                   sndEnemyDown, sndCoward, sndHurry);
+                   sndEnemyDown, sndCoward, sndHurry, sndWatchIt);
 
      TAmmoType  = (amGrenade, amClusterBomb, amBazooka, amUFO, amShotgun, amPickHammer,
                    amSkip, amRope, amMine, amDEagle, amDynamite, amFirePunch,
@@ -411,7 +411,8 @@
                 (FileName:'Youllregretthat.ogg';Path: ptVoices; id: nil; lastChan: 0),// sndRegret
                 (FileName:     'Enemydown.ogg'; Path: ptVoices; id: nil; lastChan: 0),// sndEnemyDown
                 (FileName:        'Coward.ogg'; Path: ptVoices; id: nil; lastChan: 0),// sndCoward
-                (FileName:         'Hurry.ogg'; Path: ptVoices; id: nil; lastChan: 0) // sndHurry
+                (FileName:         'Hurry.ogg'; Path: ptVoices; id: nil; lastChan: 0),// sndHurry
+                (FileName:       'Watchit.ogg'; Path: ptVoices; id: nil; lastChan: 0) // sndWatchIt
                 );
 
       Ammoz: array [TAmmoType] of record
--- a/hedgewars/uStats.pas	Fri Apr 25 16:09:20 2008 +0000
+++ b/hedgewars/uStats.pas	Fri Apr 25 20:41:23 2008 +0000
@@ -95,7 +95,10 @@
 
 else if DamageClan <> 0 then
 	if DamageTotal > DamageClan then
-		PlaySound(sndNutter, false)
+		if random(2) = 0 then
+			PlaySound(sndNutter, false)
+		else
+			PlaySound(sndWatchIt, false)
 	else
 		if random(2) = 0 then
 			PlaySound(sndSameTeam, false)