# HG changeset patch # User unc0rr # Date 1179851519 0 # Node ID d48d8c0a546da636cb4d41b411f2bc1c029a3a5c # Parent ba560c17c24cd71033e3801a2f36e4b867572a6f - Fix bug with desert damaging current hedgehog - Pass string as 'const' parameters diff -r ba560c17c24c -r d48d8c0a546d hedgewars/HHHandlers.inc --- a/hedgewars/HHHandlers.inc Mon May 21 18:07:25 2007 +0000 +++ b/hedgewars/HHHandlers.inc Tue May 22 16:31:59 2007 +0000 @@ -64,7 +64,7 @@ amSkip: TurnTimeLeft:= 0; amRope: CurAmmoGear:= AddGear(hwRound(Gear^.X), hwRound(Gear^.Y), gtRope, 0, xx, yy, 0); amMine: AddGear(hwRound(X) + hwSign(dX) * 7, hwRound(Y), gtMine, 0, SignAs(_0_02, dX), _0, 3000); - amDEagle: AddGear(hwRound(X), hwRound(Y), gtDEagleShot, 0, xx * _0_5, yy * _0_5, 0); + amDEagle: AddGear(hwRound(X + xx * cHHRadius), hwRound(Y + yy * cHHRadius), gtDEagleShot, 0, xx * _0_5, yy * _0_5, 0); amDynamite: AddGear(hwRound(X) + hwSign(dX) * 7, hwRound(Y), gtDynamite, 0, SignAs(_0_03, dX), _0, 5000); amBaseballBat: AddGear(hwRound(X) + hwSign(dX) * 10, hwRound(Y), gtShover, 0, xx * _0_5, yy * _0_5, 0)^.Radius:= 20; amFirePunch: CurAmmoGear:= AddGear(hwRound(X) + hwSign(dX) * 10, hwRound(Y), gtFirePunch, 0, _0, _0, 0); diff -r ba560c17c24c -r d48d8c0a546d hedgewars/uStore.pas --- a/hedgewars/uStore.pas Mon May 21 18:07:25 2007 +0000 +++ b/hedgewars/uStore.pas Tue May 22 16:31:59 2007 +0000 @@ -39,7 +39,7 @@ procedure RenderHealth(var Hedgehog: THedgehog); procedure AddProgress; procedure FinishProgress; -function LoadImage(filename: string; hasAlpha, critical, setTransparent: boolean): PSDL_Surface; +function LoadImage(const filename: string; hasAlpha, critical, setTransparent: boolean): PSDL_Surface; var PixelFormat: PSDL_PixelFormat; SDLPrimSurface: PSDL_Surface; @@ -460,7 +460,7 @@ Hedgehog.HealthTag:= RenderString(s, Hedgehog.Team^.Color, fnt16) end; -function LoadImage(filename: string; hasAlpha: boolean; critical, setTransparent: boolean): PSDL_Surface; +function LoadImage(const filename: string; hasAlpha: boolean; critical, setTransparent: boolean): PSDL_Surface; var tmpsurf: PSDL_Surface; Result: PSDL_Surface; s: shortstring;