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.
Use some more sounds
authorunc0rr
Thu, 24 Apr 2008 14:49:19 +0000
changeset 864 024369e09a53
parent 863 dfa3aa51ecb5
child 865 a4a5ec6c61d4
Use some more sounds
doc/SoundsMapping.txt file | annotate | diff | comparison | revisions
hedgewars/HHHandlers.inc 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 14:36:38 2008 +0000
+++ b/doc/SoundsMapping.txt	Thu Apr 24 14:49:19 2008 +0000
@@ -25,14 +25,14 @@
 leave me alone - when a hedgehog is being picked on / hit a certain amount of times in a row
  + Missed - when enemy misses
 Nooooo - when a hh is blasted off of the screen
-Nutter - when you hit your own hh
+ + Nutter - when you hit your own hh
 Oh dear - another thing to say before dying
 oops - when a hedgehog hurts itself with a small amount of damage
 Perfect - when hitting 3 or more hhs at once
 reinforcements - when a weapon crate drops
 Revenge - when a hedgehog is hit by the same hog twice
 runaway - when dynamite is dropped near your hog
-same team - when you hit a hog on the same team
+ + same team - when you hit a hog on the same team
 so long - said before you die
  + stupid - when you hit yourself
 Take cover - when a grenade lands nearby
--- a/hedgewars/HHHandlers.inc	Thu Apr 24 14:36:38 2008 +0000
+++ b/hedgewars/HHHandlers.inc	Thu Apr 24 14:49:19 2008 +0000
@@ -182,7 +182,7 @@
 	begin
 	AllInactive:= false;
 	PlaySound(sndByeBye, false);
-	Gear^.Timer:= 1250
+	Gear^.Timer:= 1100
 	end
 end;
 
@@ -510,7 +510,10 @@
 if (Gear^.Health = 0) then
 	begin
 	if AllInactive then
-		Gear^.doStep:= @doStepHedgehogDead;
+		begin
+		Gear^.Timer:= 0;
+		Gear^.doStep:= @doStepHedgehogDead
+		end;
 	AllInactive:= false;
 	exit
 	end;
--- a/hedgewars/uConsts.pas	Thu Apr 24 14:36:38 2008 +0000
+++ b/hedgewars/uConsts.pas	Thu Apr 24 14:49:19 2008 +0000
@@ -61,7 +61,8 @@
                    sndSplash, sndShotgunReload, sndShotgunFire, sndGraveImpact,
                    sndMineTick, sndPickhammer, sndGun, sndUFO, sndJump1, sndJump2,
                    sndJump3, sndYesSir, sndLaugh, sndIllGetYou, sndIncoming,
-                   sndMissed, sndStupid, sndFirstBlood, sndBoring, sndByeBye);
+                   sndMissed, sndStupid, sndFirstBlood, sndBoring, sndByeBye,
+                   sndSameTeam, sndNutter);
 
      TAmmoType  = (amGrenade, amClusterBomb, amBazooka, amUFO, amShotgun, amPickHammer,
                    amSkip, amRope, amMine, amDEagle, amDynamite, amFirePunch,
@@ -398,7 +399,9 @@
                 (FileName:        'Stupid.ogg'; Path: ptVoices; id: nil; lastChan: 0),// sndStupid
                 (FileName:    'Firstblood.ogg'; Path: ptVoices; id: nil; lastChan: 0),// sndFirstBlood
                 (FileName:        'Boring.ogg'; Path: ptVoices; id: nil; lastChan: 0),// sndBoring
-                (FileName:        'Byebye.ogg'; Path: ptVoices; id: nil; lastChan: 0) // sndByeBye
+                (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
                 );
 
       Ammoz: array [TAmmoType] of record
--- a/hedgewars/uStats.pas	Thu Apr 24 14:36:38 2008 +0000
+++ b/hedgewars/uStats.pas	Thu Apr 24 14:49:19 2008 +0000
@@ -61,10 +61,20 @@
 begin
 inc(CurrentHedgehog^.stats.FinishedTurns);
 
-if (DamageGiven = DamageTotal) and (DamageTotal > 0) then PlaySound(sndFirstBlood, false)
-else if CurrentHedgehog^.stats.StepDamageRecv > 0 then PlaySound(sndStupid, false)
+if (DamageGiven = DamageTotal) and (DamageTotal > 0) then
+	PlaySound(sndFirstBlood, false)
+
+else if CurrentHedgehog^.stats.StepDamageRecv > 0 then
+	PlaySound(sndStupid, false)
+
 else if DamageClan <> 0 then
+	if DamageTotal > DamageClan then
+		PlaySound(sndNutter, false)
+	else
+		PlaySound(sndSameTeam, false)
+
 else if DamageGiven <> 0 then
+
 else if AmmoDamagingUsed then PlaySound(sndMissed, false);
 
 Gear:= GearsList;
hedgewars