# HG changeset patch # User smxx # Date 1269625401 0 # Node ID c6c57c499034ab5e7bdc5f9f4fe1bc05dae0cfe4 # Parent a12771928d40fc8145b065c32c33af3134ff9990 Engine: * Added small drop shadow to chat lines * Fixed Birdy to really end the round * Updated German texts diff -r a12771928d40 -r c6c57c499034 hedgewars/uChat.pas --- a/hedgewars/uChat.pas Fri Mar 26 17:34:58 2010 +0000 +++ b/hedgewars/uChat.pas Fri Mar 26 17:43:21 2010 +0000 @@ -126,6 +126,9 @@ begin r.w:= InputStr.Width; DrawFillRect(r); + Tint(0, 0, 0, 0.5); + DrawTexture(9 - cScreenWidth div 2, visibleCount * 16 + 11, InputStr.Tex); + Tint(1, 1, 1, 1); DrawTexture(8 - cScreenWidth div 2, visibleCount * 16 + 10, InputStr.Tex); end; @@ -142,6 +145,9 @@ begin r.w:= Strs[i].Width; DrawFillRect(r); + Tint(0, 0, 0, 0.5); + DrawTexture(9 - cScreenWidth div 2, (visibleCount - t) * 16 - 5, Strs[i].Tex); + Tint(1, 1, 1, 1); DrawTexture(8 - cScreenWidth div 2, (visibleCount - t) * 16 - 6, Strs[i].Tex); dec(r.y, 16); diff -r a12771928d40 -r c6c57c499034 hedgewars/uConsts.pas --- a/hedgewars/uConsts.pas Fri Mar 26 17:34:58 2010 +0000 +++ b/hedgewars/uConsts.pas Fri Mar 26 17:43:21 2010 +0000 @@ -1737,7 +1737,7 @@ ammoprop_DontHold; Count: 1; InitialCount: 1; - NumPerTurn: 1; + NumPerTurn: 0; Timer: 0; Pos: 0; AmmoType: amBirdy; @@ -1746,7 +1746,7 @@ TimeAfterTurn: 3000; minAngle: 0; maxAngle: 0; - isDamaging: false; + isDamaging: true; SkipTurns: 0; PosCount: 1; PosSprite: sprWater) diff -r a12771928d40 -r c6c57c499034 hedgewars/uStore.pas --- a/hedgewars/uStore.pas Fri Mar 26 17:34:58 2010 +0000 +++ b/hedgewars/uStore.pas Fri Mar 26 17:43:21 2010 +0000 @@ -80,6 +80,7 @@ procedure RenderWeaponTooltip(atype: TAmmoType); procedure ShowWeaponTooltip(x, y: LongInt); procedure FreeWeaponTooltip; +procedure Tint(r, g, b, a: Single); implementation uses uMisc, uConsole, uLand, uLocale, uWorld{$IFDEF IPHONEOS}, PascalExports{$ENDIF}; @@ -90,6 +91,11 @@ MaxTextureSize: Integer; cGPUVendor: TGPUVendor; +procedure Tint(r, g, b, a: Single); +begin +glColor4f(r, g, b, a); +end; + procedure DrawRoundRect(rect: PSDL_Rect; BorderColor, FillColor: Longword; Surface: PSDL_Surface; Clear: boolean); var r: TSDL_Rect; begin diff -r a12771928d40 -r c6c57c499034 share/hedgewars/Data/Locale/de.txt --- a/share/hedgewars/Data/Locale/de.txt Fri Mar 26 17:34:58 2010 +0000 +++ b/share/hedgewars/Data/Locale/de.txt Fri Mar 26 17:43:21 2010 +0000 @@ -1,4 +1,4 @@ -; German locale +; German locale 00:00=Granate 00:01=Splittergranate @@ -164,7 +164,7 @@ 03:00=Zeitzünder-Granate 03:01=Zeitzünder-Granate 03:02=Ballistische Waffe -03:03=Zielsuchende Waffe +03:03=Vorsicht, sticht! 03:04=Gewehr (mehrere Schüsse) 03:05=Grabwerkzeug 03:06=Aktion