# HG changeset patch # User nemo # Date 1314937494 14400 # Node ID aca2acfba4ca920a2dd5bbc7bf325d63e02a2a2a # Parent f342e0cf4f34a30e36b2c5dc434e7d3ffd30ef40 *sigh* I suppose I'd best avoid those trademarks... diff -r f342e0cf4f34 -r aca2acfba4ca hedgewars/GSHandlers.inc --- a/hedgewars/GSHandlers.inc Thu Sep 01 20:52:17 2011 +0200 +++ b/hedgewars/GSHandlers.inc Fri Sep 02 00:24:54 2011 -0400 @@ -4921,6 +4921,7 @@ HH:= Gear^.Hedgehog; if Gear^.Pos = 2 then begin + StopSound(Gear^.SoundChannel); if (Gear^.Timer = 0) then begin if (HH^.Gear <> nil) and (HH^.Gear^.State and gstInvisible = 0) then @@ -4951,8 +4952,9 @@ inc(Gear^.Timer); if (Gear^.Timer > 2000) and ((GameTicks mod 2000) = 1000) then begin - Gear^.Pos:= 3; - end; + Gear^.SoundChannel := LoopSound(sndTardis); + Gear^.Pos:= 3 + end end; if (Gear^.Pos = 1) and (GameTicks and $1F = 0) and (Gear^.Power < 255) then inc(Gear^.Power); @@ -4960,6 +4962,7 @@ if (Gear^.Pos = 1) and (Gear^.Power = 255) and ((GameTicks mod 2000) = 1000) then Gear^.Pos:= 2; if (Gear^.Pos = 3) and (Gear^.Power = 0) then begin + StopSound(Gear^.SoundChannel); if HH^.GearHidden = nil then begin DeleteGear(Gear); @@ -4981,6 +4984,7 @@ HH^.Team^.Clan^.Teams[j]^.Hedgehogs[i].Gear^.Damage) then inc(cnt); if (cnt = 0) or SuddenDeathDmg or (Gear^.Timer = 0) then begin + Gear^.SoundChannel := LoopSound(sndTardis); Gear^.Pos:= 1; Gear^.Power:= 0; Gear^.Timer:= 0; @@ -5039,6 +5043,7 @@ DeleteGear(gear); exit end; + Gear^.SoundChannel := LoopSound(sndTardis); Gear^.doStep:= @doStepTardisWarp end; diff -r f342e0cf4f34 -r aca2acfba4ca hedgewars/uGearsRender.pas --- a/hedgewars/uGearsRender.pas Thu Sep 01 20:52:17 2011 +0200 +++ b/hedgewars/uGearsRender.pas Fri Sep 02 00:24:54 2011 -0400 @@ -1084,10 +1084,12 @@ gtTardis: if Gear^.Pos <> 4 then begin if (Gear^.Pos = 1) or (Gear^.Pos = 3) then - Tint($FF, $FF, $FF, max($00, round(Gear^.Power * (1-abs(0.5 - (GameTicks mod 2000) / 2000))))); - DrawSprite(sprTardis, x-24, y-63,0); - if (Gear^.Pos = 1) or (Gear^.Pos = 3) then - Tint($FF, $FF, $FF, $FF) + Tint(Gear^.Hedgehog^.Team^.Clan^.Color shl 8 or max($00, round(Gear^.Power * (1-abs(0.5 - (GameTicks mod 2000) / 2000))))) + else Tint(Gear^.Hedgehog^.Team^.Clan^.Color shl 8 or $FF); + DrawSprite(sprTardis, x-26, y-63,0); + Tint(Gear^.Hedgehog^.Team^.Clan^.Color shl 8 or max($00, round(Gear^.Power * abs(1 - (RealTicks mod 500) / 250)))); + DrawTexture(x-6, y-70, SpritesData[sprVampiric].Texture, 0.25); + Tint($FF, $FF, $FF, $FF) end; diff -r f342e0cf4f34 -r aca2acfba4ca hedgewars/uTypes.pas --- a/hedgewars/uTypes.pas Thu Sep 01 20:52:17 2011 +0200 +++ b/hedgewars/uTypes.pas Fri Sep 02 00:24:54 2011 -0400 @@ -136,7 +136,7 @@ sndPoisonCough, sndPoisonMoan, sndBirdyLay, sndWhistle, sndBeeWater, sndPiano0, sndPiano1, sndPiano2, sndPiano3, sndPiano4, sndPiano5, sndPiano6, sndPiano7, sndPiano8, sndSkip, sndSineGun, sndOoff1, sndOoff2, sndOoff3, sndWhack, - sndComeonthen, sndParachute, sndBump, sndResurrector, sndPlane); + sndComeonthen, sndParachute, sndBump, sndResurrector, sndPlane, sndTardis); // Available ammo types to be used by hedgehogs TAmmoType = (amNothing, amGrenade, amClusterBomb, amBazooka, amBee, amShotgun, amPickHammer, // 6 diff -r f342e0cf4f34 -r aca2acfba4ca hedgewars/uVariables.pas --- a/hedgewars/uVariables.pas Thu Sep 01 20:52:17 2011 +0200 +++ b/hedgewars/uVariables.pas Fri Sep 02 00:24:54 2011 -0400 @@ -753,7 +753,8 @@ (FileName: 'parachute.ogg'; Path: ptSounds),// sndParachute (FileName: 'bump.ogg'; Path: ptSounds),// sndBump (FileName: 'hogchant3.ogg'; Path: ptSounds),// sndResurrector - (FileName: 'plane.ogg'; Path: ptSounds) // sndPlane + (FileName: 'plane.ogg'; Path: ptSounds), // sndPlane + (FileName: 'TARDIS.ogg'; Path: ptSounds) // sndTardis ); Ammoz: array [TAmmoType] of record diff -r f342e0cf4f34 -r aca2acfba4ca share/hedgewars/Data/Graphics/TARDIS.png Binary file share/hedgewars/Data/Graphics/TARDIS.png has changed diff -r f342e0cf4f34 -r aca2acfba4ca share/hedgewars/Data/Graphics/TARDIS.svg --- a/share/hedgewars/Data/Graphics/TARDIS.svg Thu Sep 01 20:52:17 2011 +0200 +++ b/share/hedgewars/Data/Graphics/TARDIS.svg Fri Sep 02 00:24:54 2011 -0400 @@ -2,1363 +2,79 @@ + width="602.30084" + height="985.60046" + id="svg2993"> - - - - - - - - - - - - - + id="defs2995"> - - + id="linearGradient3989"> - - - - - - - + id="stop3991" + style="stop-color:#fafafa;stop-opacity:1" + offset="0" /> - - - - - - - + id="stop3993" + style="stop-color:#8b8b8b;stop-opacity:1" + offset="1" /> - + id="linearGradient3828"> - - + id="stop3830" + style="stop-color:#8b8b8b;stop-opacity:1" + offset="0" /> - + id="stop3832" + style="stop-color:#fafafa;stop-opacity:1" + offset="1" /> - - - - - - - - - - - - - - - - - + x1="-1057.5507" + y1="191.91734" + x2="-1059.9078" + y2="-113.3521" + id="linearGradient3844" + xlink:href="#linearGradient3828" + gradientUnits="userSpaceOnUse" /> - - - - - - - - - - - - - - - - - - - + x1="113.2114" + y1="152.75597" + x2="199.6232" + y2="-33.112103" + id="linearGradient3854" + xlink:href="#linearGradient3828" + gradientUnits="userSpaceOnUse" /> + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + id="stop3421-3" + style="stop-color:#0affff;stop-opacity:0.75083059" + offset="0" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + id="stop3423-8" + style="stop-color:#0affff;stop-opacity:0" + offset="1" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + id="metadata2998"> @@ -1370,801 +86,58 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + transform="translate(-57.858835,37.069206)" + id="layer1"> - - - - - - - - - - - - - - + d="M 193.68166,945.76029 88.531636,890.13291 C 76.410572,885.84471 57.262781,868.73504 58.412982,856.86326 L 59.004715,114.97423 160,178.07647 l 0.74685,724.2708 z" + id="path3775" + style="fill:#969696;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + - - - - - - - - - - - - - - + d="M 59.826686,115.09061 161.01015,177.90315 394.28571,-36.209246 C 283.33742,-41.330714 139.17799,6.9866679 59.826686,115.09061 z" + id="path3846" + style="fill:url(#linearGradient3854);fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> - - - - - - - - - - - - - - - - - - - ADVICE & ASSISTANCEOBTAINABLE IMMEDIATELY - POLICE TELEPHONE - FOR THE USE OF - FREE - PUBLIC - PULL TO OPEN - OFFICER & CARSRESPOND TO ALL CALLS - - - - - POLICE - BOX - PUBLICCALL - - - POLICE - BOX - PUBLICCALL - - - - - - - ADVICE & ASSISTANCEOBTAINABLE IMMEDIATELY - POLICE TELEPHONE - FOR THE USE OF - FREE - PUBLIC - PULL TO OPEN - OFFICER & CARSRESPOND TO ALL CALLS - - + d="m -791.42856,98.076469 a 268.57144,268.57144 0 1 1 -537.14284,0 268.57144,268.57144 0 1 1 537.14284,0 z" + transform="matrix(0.93114557,0,0,0.89934391,1396.8704,117.12435)" + id="path3836" + style="fill:url(#linearGradient3844);fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + + + + diff -r f342e0cf4f34 -r aca2acfba4ca share/hedgewars/Data/Locale/en.txt --- a/share/hedgewars/Data/Locale/en.txt Thu Sep 01 20:52:17 2011 +0200 +++ b/share/hedgewars/Data/Locale/en.txt Fri Sep 02 00:24:54 2011 -0400 @@ -53,7 +53,7 @@ 00:50=Drill Strike 00:51=Mudball 00:52=No weapon selected -00:53=TARDIS +00:53=TimeBox 00:54=Structure 00:55=Land Spray