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.
sounds for teleport and beginning of sudden death
authorkoda
Wed, 01 Jul 2009 22:50:27 +0000
changeset 2217 458c08d74ae6
parent 2216 82e7da49c26a
child 2218 59a9bebc4988
sounds for teleport and beginning of sudden death
hedgewars/GSHandlers.inc file | annotate | diff | comparison | revisions
hedgewars/uConsts.pas file | annotate | diff | comparison | revisions
hedgewars/uGears.pas file | annotate | diff | comparison | revisions
share/hedgewars/Data/Sounds/suddendeath.ogg file | annotate | diff | comparison | revisions
share/hedgewars/Data/Sounds/warp.ogg file | annotate | diff | comparison | revisions 
--- a/hedgewars/GSHandlers.inc	Tue Jun 30 17:02:41 2009 +0000
+++ b/hedgewars/GSHandlers.inc	Wed Jul 01 22:50:27 2009 +0000
@@ -1495,7 +1495,7 @@
 	inc(Gear^.Pos);
 	if Gear^.Pos = 11 then
 		Gear^.doStep:= @doStepTeleportAfter
-	end
+	end;
 end;
 
 procedure doStepTeleport(Gear: PGear);
@@ -1524,7 +1524,9 @@
 		HHGear^.Y:= int2hwFloat(TargetPoint.Y);
 		HHGear^.State:= HHGear^.State or gstMoving
 		end;
-TargetPoint.X:= NoPointX
+TargetPoint.X:= NoPointX;
+playSound(sndWarp, false, nil);
+
 end;
 
 ////////////////////////////////////////////////////////////////////////////////
--- a/hedgewars/uConsts.pas	Tue Jun 30 17:02:41 2009 +0000
+++ b/hedgewars/uConsts.pas	Wed Jul 01 22:50:27 2009 +0000
@@ -92,7 +92,8 @@
 			sndCake, sndOw1, sndOw4, sndFirePunch1, sndFirePunch2,
 			sndFirePunch3, sndFirePunch4, sndFirePunch5, sndFirePunch6,
 			sndMelon, sndHellish, sndYoohoo, sndRCPlane, sndWhipCrack,
-			sndRideOfTheValkyries, sndDenied, sndPlaced, sndBaseballBat, sndVaporize);
+			sndRideOfTheValkyries, sndDenied, sndPlaced, sndBaseballBat, 
+			sndVaporize, sndWarp, sndSuddenDeath);
 
 	TAmmoType  = (amGrenade, amClusterBomb, amBazooka, amUFO, amShotgun, amPickHammer,
 			amSkip, amRope, amMine, amDEagle, amDynamite, amFirePunch, amWhip,
@@ -110,7 +111,7 @@
 	TStatInfoType = (siGameResult, siMaxStepDamage, siMaxStepKills, siKilledHHs,
 			siClanHealth);
 
-	TWave = (waveRollup, waveSad,waveWave, waveHurrah, waveLemonade, waveShrug, waveJuggle);
+	TWave = (waveRollup, waveSad, waveWave, waveHurrah, waveLemonade, waveShrug, waveJuggle);
 
 	THHFont = record
 			Handle: PTTF_Font;
@@ -178,7 +179,8 @@
 	COLOR_LAND           = $FFFFFFFF;  // white
 	COLOR_INDESTRUCTIBLE = $FF0000FF;  // red
 
-    GL_BGR = $80E0; // some opengl headers do not have these macros
+	// some opengl headers do not have these macros
+    	GL_BGR = $80E0;
 	GL_BGRA = $80E1;
 
 	cifRandomize = $00000001;
@@ -639,7 +641,9 @@
 			(FileName:               'denied.ogg'; Path: ptSounds),// sndDenied
 			(FileName:               'placed.ogg'; Path: ptSounds),// sndPlaced
 			(FileName:          'baseballbat.ogg'; Path: ptSounds),// sndBaseballBat
-			(FileName:                'steam.ogg'; Path: ptSounds) // sndVaporize
+			(FileName:                'steam.ogg'; Path: ptSounds),// sndVaporize
+			(FileName:                 'warp.ogg'; Path: ptSounds),// sndWarp
+			(FileName:          'suddendeath.ogg'; Path: ptSounds) // sndSuddenDeath
 			);
 
 	Ammoz: array [TAmmoType] of record
--- a/hedgewars/uGears.pas	Tue Jun 30 17:02:41 2009 +0000
+++ b/hedgewars/uGears.pas	Wed Jul 01 22:50:27 2009 +0000
@@ -591,7 +591,8 @@
 			if (TotalRounds = cSuddenDTurns) and (cHealthDecrease = 0) then
 				begin
 				cHealthDecrease:= 5;
-				AddCaption(trmsg[sidSuddenDeath], $FFFFFF, capgrpGameState)
+				AddCaption(trmsg[sidSuddenDeath], $FFFFFF, capgrpGameState);
+				playSound(sndSuddenDeath, false, nil);
 				end;
 
 			if (cHealthDecrease = 0)
Binary file share/hedgewars/Data/Sounds/suddendeath.ogg has changed
Binary file share/hedgewars/Data/Sounds/warp.ogg has changed
hedgewars