# HG changeset patch
# User unc0rr
# Date 1209156083 0
# Node ID 9bec5af9b23cd4cee61225ab290045b2d5f1035c
# Parent d5f32e2dc166ae996d3125665008062346ec5771
One more sound
diff -r d5f32e2dc166 -r 9bec5af9b23c doc/SoundsMapping.txt
--- 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
diff -r d5f32e2dc166 -r 9bec5af9b23c hedgewars.kdevelop
--- 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 @@
hedgewars
.
false
-
+
kdevsubversion
-
+
executable
/
bin/hedgewars
-
+
false
true
-
+
/usr/home/unC0Rr/Sources/Hedgewars/Hedgewars-GNA
false
false
@@ -98,16 +98,16 @@
make
-
+
true
4
0
false
-
-
-
+
+
+
default
@@ -115,9 +115,9 @@
0
-
-
-
+
+
+
default
@@ -126,12 +126,12 @@
-
+
-
-
-
-
+
+
+
+
true
false
false
@@ -237,7 +237,7 @@
false
-
+
set
m_,_
theValue
@@ -256,7 +256,7 @@
false
-
+
true
false
diff -r d5f32e2dc166 -r 9bec5af9b23c hedgewars/uConsts.pas
--- 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
diff -r d5f32e2dc166 -r 9bec5af9b23c hedgewars/uStats.pas
--- 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)