--- a/doc/SoundsMapping.txt Thu Apr 24 14:49:19 2008 +0000
+++ b/doc/SoundsMapping.txt Thu Apr 24 15:03:57 2008 +0000
@@ -29,7 +29,7 @@
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
+ + 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
--- a/hedgewars/HHHandlers.inc Thu Apr 24 14:49:19 2008 +0000
+++ b/hedgewars/HHHandlers.inc Thu Apr 24 15:03:57 2008 +0000
@@ -505,7 +505,11 @@
doStepHedgehogMoving(Gear);
-if (Gear^.State and gstMoving) <> 0 then exit;
+if (Gear^.State and gstMoving) <> 0 then
+ begin
+ AllInactive:= false;
+ exit
+ end;
if (Gear^.Health = 0) then
begin
--- a/hedgewars/uConsts.pas Thu Apr 24 14:49:19 2008 +0000
+++ b/hedgewars/uConsts.pas Thu Apr 24 15:03:57 2008 +0000
@@ -62,7 +62,7 @@
sndMineTick, sndPickhammer, sndGun, sndUFO, sndJump1, sndJump2,
sndJump3, sndYesSir, sndLaugh, sndIllGetYou, sndIncoming,
sndMissed, sndStupid, sndFirstBlood, sndBoring, sndByeBye,
- sndSameTeam, sndNutter);
+ sndSameTeam, sndNutter, sndReinforce);
TAmmoType = (amGrenade, amClusterBomb, amBazooka, amUFO, amShotgun, amPickHammer,
amSkip, amRope, amMine, amDEagle, amDynamite, amFirePunch,
@@ -401,7 +401,8 @@
(FileName: 'Boring.ogg'; Path: ptVoices; id: nil; lastChan: 0),// sndBoring
(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: 'Nutter.ogg'; Path: ptVoices; id: nil; lastChan: 0),// sndNutter
+ (FileName:'Reinforcements.ogg'; Path: ptVoices; id: nil; lastChan: 0) // sndReinforce
);
Ammoz: array [TAmmoType] of record
--- a/hedgewars/uGears.pas Thu Apr 24 14:49:19 2008 +0000
+++ b/hedgewars/uGears.pas Thu Apr 24 15:03:57 2008 +0000
@@ -1055,6 +1055,7 @@
inc(i);
dec(t, Ammoz[i].Probability)
end;
+ PlaySound(sndReinforce, false);
FollowGear^.Pos:= posCaseAmmo;
FollowGear^.State:= Longword(i)
end;
--- a/hedgewars/uMisc.pas Thu Apr 24 14:49:19 2008 +0000
+++ b/hedgewars/uMisc.pas Thu Apr 24 15:03:57 2008 +0000
@@ -61,7 +61,7 @@
cExplosionBorderColor : LongWord = $808080;
cShowFPS : boolean = true;
- cCaseFactor : Longword = 6; {0..9}
+ cCaseFactor : Longword = 5; {0..9}
cLandAdditions: Longword = 4;
cFullScreen : boolean = true;
cLocaleFName : shortstring = 'en.txt';