# HG changeset patch # User sheepluva # Date 1416154033 -3600 # Node ID 325f7bb605803d45e8a61c1fb35f70f14e74a9f3 # Parent 03894bfb8bf3b4a636af82467ce78b6d733197b0 fix health crate collision diff -r 03894bfb8bf3 -r 325f7bb60580 hedgewars/uConsts.pas --- a/hedgewars/uConsts.pas Sun Nov 16 00:57:05 2014 +0300 +++ b/hedgewars/uConsts.pas Sun Nov 16 17:07:13 2014 +0100 @@ -302,6 +302,8 @@ posCaseExplode = $00000010; posCasePoison = $00000020; + cCaseHealthRadius = 14; + // hog tag mask //htNone = $00; htTeamName = $01; diff -r 03894bfb8bf3 -r 325f7bb60580 hedgewars/uGears.pas --- a/hedgewars/uGears.pas Sun Nov 16 00:57:05 2014 +0300 +++ b/hedgewars/uGears.pas Sun Nov 16 17:07:13 2014 +0100 @@ -749,6 +749,8 @@ HealthCrate: begin FollowGear^.Pos := posCaseHealth; + // health crate is smaller than the other crates + FollowGear^.Radius := cCaseHealthRadius; FollowGear^.Health := content; AddCaption(GetEventString(eidNewHealthPack), cWhiteColor, capgrpAmmoInfo); end; @@ -787,6 +789,8 @@ HealthCrate: begin FollowGear^.Pos := FollowGear^.Pos + posCaseHealth; + // health crate is smaller than the other crates + FollowGear^.Radius := cCaseHealthRadius; AddCaption(GetEventString(eidNewHealthPack), cWhiteColor, capgrpAmmoInfo); end; AmmoCrate: diff -r 03894bfb8bf3 -r 325f7bb60580 hedgewars/uGearsUtils.pas --- a/hedgewars/uGearsUtils.pas Sun Nov 16 00:57:05 2014 +0300 +++ b/hedgewars/uGearsUtils.pas Sun Nov 16 17:07:13 2014 +0100 @@ -1306,6 +1306,8 @@ FollowGear:= AddGear(0, 0, gtCase, 0, _0, _0, 0); FollowGear^.Health:= cHealthCaseAmount; FollowGear^.Pos:= posCaseHealth; + // health crate is smaller than the other crates + FollowGear^.Radius := cCaseHealthRadius; AddCaption(GetEventString(eidNewHealthPack), cWhiteColor, capgrpAmmoInfo); end else if (t