Aaaand merge .17 into trunk.
--- a/gameServer/Utils.hs Sun Nov 13 21:28:11 2011 +0100
+++ b/gameServer/Utils.hs Mon Nov 14 13:15:55 2011 -0500
@@ -88,6 +88,8 @@
, (38, "0.9.16-dev")
, (39, "0.9.16")
, (40, "0.9.17-dev")
+ , (41, "0.9.17")
+ , (42, "0.9.18-dev")
]
askFromConsole :: B.ByteString -> IO B.ByteString
--- a/hedgewars/GSHandlers.inc Sun Nov 13 21:28:11 2011 +0100
+++ b/hedgewars/GSHandlers.inc Mon Nov 14 13:15:55 2011 -0500
@@ -2475,7 +2475,7 @@
Gear^.doStep := @doStepFirePunchWork;
DrawTunnel(HHGear^.X - int2hwFloat(cHHRadius), HHGear^.Y + _1, _0_5, _0, cHHRadius * 4, 5);
- AddVoice(TSound(ord(sndFirePunch1) + GetRandom(6)), HHGear^.Hedgehog^.Team^.voicepack)
+ PlaySound(TSound(ord(sndFirePunch1) + GetRandom(6)), HHGear^.Hedgehog^.Team^.voicepack)
end;
////////////////////////////////////////////////////////////////////////////////
--- a/hedgewars/uCaptions.pas Sun Nov 13 21:28:11 2011 +0100
+++ b/hedgewars/uCaptions.pas Mon Nov 14 13:15:55 2011 -0500
@@ -35,17 +35,24 @@
type TCaptionStr = record
Tex: PTexture;
EndTime: LongWord;
+ Text: shortstring;
end;
var
Captions: array[TCapGroup] of TCaptionStr;
procedure AddCaption(s: shortstring; Color: Longword; Group: TCapGroup);
begin
- if Captions[Group].Tex <> nil then
+ if (Captions[Group].Tex <> nil) and (Captions[Group].Text <> s) then
+ begin
FreeTexture(Captions[Group].Tex);
- Captions[Group].Tex:= nil;
-
- Captions[Group].Tex:= RenderStringTex(s, Color, fntBig);
+ Captions[Group].Tex:= nil
+ end;
+
+ if Captions[Group].Text <> s then
+ begin
+ Captions[Group].Text:= s;
+ Captions[Group].Tex:= RenderStringTex(s, Color, fntBig)
+ end;
case Group of
capgrpGameState: Captions[Group].EndTime:= RealTicks + 2200
--- a/share/hedgewars/Data/Themes/Eyes/theme.cfg Sun Nov 13 21:28:11 2011 +0100
+++ b/share/hedgewars/Data/Themes/Eyes/theme.cfg Mon Nov 14 13:15:55 2011 -0500
@@ -7,3 +7,4 @@
clouds = 9
flakes = 50, 1, 1000, 50, 50
;1, 1000, 50, 50 are copied from bamboo theme, as these numbers are required
+flatten-flakes = yes