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 seduction sound
authorunc0rr
Thu, 16 Oct 2008 16:57:51 +0000
changeset 1367 e1aaa1a4901f
parent 1366 eba12c22f8ca
child 1368 a734715a777a
Use seduction sound
hedgewars/GSHandlers.inc file | annotate | diff | comparison | revisions
hedgewars/uConsts.pas file | annotate | diff | comparison | revisions
hedgewars/uGears.pas file | annotate | diff | comparison | revisions 
--- a/hedgewars/GSHandlers.inc	Thu Oct 16 16:54:44 2008 +0000
+++ b/hedgewars/GSHandlers.inc	Thu Oct 16 16:57:51 2008 +0000
@@ -1740,8 +1740,10 @@
 	Gear^.Timer:= 0;
 	inc(Gear^.Pos)
 	end;
-	
-if Gear^.Pos = 8 then
+
+if Gear^.Pos = 5 then
+	PlaySound(sndYoohoo, false);
+if Gear^.Pos = 14 then
 	Gear^.doStep:= @doStepSeductionWork
 end;
 
--- a/hedgewars/uConsts.pas	Thu Oct 16 16:54:44 2008 +0000
+++ b/hedgewars/uConsts.pas	Thu Oct 16 16:57:51 2008 +0000
@@ -74,7 +74,7 @@
 			sndEnemyDown, sndCoward, sndHurry, sndWatchIt, sndKamikaze,
 			sndCake, sndOw1, sndOw4, sndFirePunch1, sndFirePunch2,
 			sndFirePunch3, sndFirePunch4, sndFirePunch5, sndFirePunch6,
-			sndMelon, sndHellish);
+			sndMelon, sndHellish, sndYoohoo);
 
 	TAmmoType  = (amGrenade, amClusterBomb, amBazooka, amUFO, amShotgun, amPickHammer,
 			amSkip, amRope, amMine, amDEagle, amDynamite, amFirePunch, amWhip,
@@ -507,7 +507,8 @@
 			(FileName:    'Firepunch5.ogg'; Path: ptSounds; id: nil; lastChan: 0),// sndFirepunch5
 			(FileName:    'Firepunch6.ogg'; Path: ptSounds; id: nil; lastChan: 0),// sndFirepunch6
 			(FileName:         'Melon.ogg'; Path: ptSounds; id: nil; lastChan: 0),// sndMelon
-			(FileName:       'Hellish.ogg'; Path: ptSounds; id: nil; lastChan: 0) // sndHellish
+			(FileName:       'Hellish.ogg'; Path: ptSounds; id: nil; lastChan: 0),// sndHellish
+			(FileName:        'Yoohoo.ogg'; Path: ptSounds; id: nil; lastChan: 0) // sndYoohoo
 			);
 
 	Ammoz: array [TAmmoType] of record
--- a/hedgewars/uGears.pas	Thu Oct 16 16:54:44 2008 +0000
+++ b/hedgewars/uGears.pas	Thu Oct 16 16:57:51 2008 +0000
@@ -1089,7 +1089,7 @@
                      DrawRotatedf(sprCakeWalk, hwRound(Gear^.X) + WorldDx, hwRound(Gear^.Y) + WorldDy, (GameTicks div 40) mod 6, hwSign(Gear^.dX), Gear^.DirAngle + hwSign(Gear^.dX) * 90)
                   else
                      DrawRotatedf(sprCakeDown, hwRound(Gear^.X) + WorldDx, hwRound(Gear^.Y) + WorldDy, 5 - Gear^.Pos, hwSign(Gear^.dX), 0);
-       gtSeduction: if Gear^.Pos >= 6 then DrawSprite(sprSeduction, hwRound(Gear^.X) - 16 + WorldDx, hwRound(Gear^.Y) - 16 + WorldDy, 0);
+       gtSeduction: if Gear^.Pos >= 14 then DrawSprite(sprSeduction, hwRound(Gear^.X) - 16 + WorldDx, hwRound(Gear^.Y) - 16 + WorldDy, 0);
       gtWatermelon: DrawRotatedf(sprWatermelon, hwRound(Gear^.X) + WorldDx, hwRound(Gear^.Y) + WorldDy, 0, 0, Gear^.DirAngle);
       gtMelonPiece: DrawRotatedf(sprWatermelon, hwRound(Gear^.X) + WorldDx, hwRound(Gear^.Y) + WorldDy, 1, 0, Gear^.DirAngle);
      gtHellishBomb: DrawRotated(sprHellishBomb, hwRound(Gear^.X) + WorldDx, hwRound(Gear^.Y) + WorldDy, 0, Gear^.DirAngle);
hedgewars