Mercurial Mercurial > hedgewars / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
- Some more sounds
authorunc0rr
Thu, 24 Apr 2008 15:19:33 +0000
changeset 866 ac6f6c95c23f
parent 865 a4a5ec6c61d4
child 867 dc7901b1120e
- Some more sounds - Fix use of sound 'boring'
doc/SoundsMapping.txt file | annotate | diff | comparison | revisions
hedgewars/CCHandlers.inc file | annotate | diff | comparison | revisions
hedgewars/HHHandlers.inc file | annotate | diff | comparison | revisions
hedgewars/uConsole.pas file | annotate | diff | comparison | revisions
hedgewars/uConsts.pas file | annotate | diff | comparison | revisions
hedgewars/uStats.pas file | annotate | diff | comparison | revisions 
--- a/doc/SoundsMapping.txt	Thu Apr 24 15:03:57 2008 +0000
+++ b/doc/SoundsMapping.txt	Thu Apr 24 15:19:33 2008 +0000
@@ -37,7 +37,7 @@
  + stupid - when you hit yourself
 Take cover - when a grenade lands nearby
 this ones mine - said sometimes when its your go
-traitor - when you hit your own team
+ + 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
@@ -45,4 +45,4 @@
 what the - when a grenade lands nearby
 whoopsee - when you take fall damage
  + yessir - when its your go
-you'll regret that - when you get hit
+ + you'll regret that - when you get hit
--- a/hedgewars/CCHandlers.inc	Thu Apr 24 15:03:57 2008 +0000
+++ b/hedgewars/CCHandlers.inc	Thu Apr 24 15:19:33 2008 +0000
@@ -370,6 +370,7 @@
 procedure chSkip(var s: shortstring);
 begin
 if not CurrentTeam^.ExtDriven then SendIPC(',');
+PlaySound(sndBoring, false);
 TurnTimeLeft:= 0
 end;
 
--- a/hedgewars/HHHandlers.inc	Thu Apr 24 15:03:57 2008 +0000
+++ b/hedgewars/HHHandlers.inc	Thu Apr 24 15:19:33 2008 +0000
@@ -107,10 +107,7 @@
                                  CurAmmoGear:= AddGear(hwRound(X), hwRound(Y), gtShotgunShot,  0, xx * _0_5, yy * _0_5, 0);
                                  end;
                    amPickHammer: CurAmmoGear:= AddGear(hwRound(Gear^.X), hwRound(Gear^.Y) + cHHRadius, gtPickHammer, 0, _0, _0, 0);
-                         amSkip: begin
-                                 TurnTimeLeft:= 0;
-                                 PlaySound(sndBoring, false)
-                                 end;
+                         amSkip: ParseCommand('/skip', true);
                          amRope: CurAmmoGear:= AddGear(hwRound(Gear^.X), hwRound(Gear^.Y), gtRope, 0, xx, yy, 0);
                          amMine: begin
                                  AddGear(hwRound(X) + hwSign(dX) * 7, hwRound(Y), gtMine, 0, SignAs(_0_02, dX), _0, 3000);
--- a/hedgewars/uConsole.pas	Thu Apr 24 15:03:57 2008 +0000
+++ b/hedgewars/uConsole.pas	Thu Apr 24 15:19:33 2008 +0000
@@ -36,7 +36,7 @@
 implementation
 {$J+}
 uses uMisc, uStore, Types, uConsts, uGears, uTeams, uIO, uKeys, uWorld, uLand,
-     uRandom, uAmmos, uTriggers, GL;
+     uRandom, uAmmos, uTriggers, GL, uSound;
 const cLineWidth: LongInt = 0;
       cLinesCount = 256;
 
--- a/hedgewars/uConsts.pas	Thu Apr 24 15:03:57 2008 +0000
+++ b/hedgewars/uConsts.pas	Thu Apr 24 15:19:33 2008 +0000
@@ -62,7 +62,7 @@
                    sndMineTick, sndPickhammer, sndGun, sndUFO, sndJump1, sndJump2,
                    sndJump3, sndYesSir, sndLaugh, sndIllGetYou, sndIncoming,
                    sndMissed, sndStupid, sndFirstBlood, sndBoring, sndByeBye,
-                   sndSameTeam, sndNutter, sndReinforce);
+                   sndSameTeam, sndNutter, sndReinforce, sndTraitor, sndRegret);
 
      TAmmoType  = (amGrenade, amClusterBomb, amBazooka, amUFO, amShotgun, amPickHammer,
                    amSkip, amRope, amMine, amDEagle, amDynamite, amFirePunch,
@@ -402,7 +402,9 @@
                 (FileName:        'Byebye.ogg'; Path: ptVoices; id: nil; lastChan: 0),// sndByeBye
                 (FileName:      'Sameteam.ogg'; Path: ptVoices; id: nil; lastChan: 0),// sndSameTeam
                 (FileName:        'Nutter.ogg'; Path: ptVoices; id: nil; lastChan: 0),// sndNutter
-                (FileName:'Reinforcements.ogg'; Path: ptVoices; id: nil; lastChan: 0) // sndReinforce
+                (FileName:'Reinforcements.ogg'; Path: ptVoices; id: nil; lastChan: 0),// sndReinforce
+                (FileName:       'Traitor.ogg'; Path: ptVoices; id: nil; lastChan: 0),// sndTraitor
+                (FileName:'Youllregretthat.ogg';Path: ptVoices; id: nil; lastChan: 0) // sndRegret
                 );
 
       Ammoz: array [TAmmoType] of record
--- a/hedgewars/uStats.pas	Thu Apr 24 15:03:57 2008 +0000
+++ b/hedgewars/uStats.pas	Thu Apr 24 15:19:33 2008 +0000
@@ -71,9 +71,12 @@
 	if DamageTotal > DamageClan then
 		PlaySound(sndNutter, false)
 	else
-		PlaySound(sndSameTeam, false)
+		if random(2) = 0 then
+			PlaySound(sndSameTeam, false)
+		else
+			PlaySound(sndTraitor, false)
 
-else if DamageGiven <> 0 then
+else if DamageGiven <> 0 then PlaySound(sndRegret, false)
 
 else if AmmoDamagingUsed then PlaySound(sndMissed, false);
hedgewars