# HG changeset patch # User nemo # Date 1415632923 18000 # Node ID 1f58cb4aa773a1f340c6c139f9ca23c4d0d63d4e # Parent b49b82351ad3f1ffa53c74e12376db9f25382834 Since unc0rr is quiet, try to avoid the assert diff -r b49b82351ad3 -r 1f58cb4aa773 hedgewars/uConsts.pas --- a/hedgewars/uConsts.pas Mon Nov 10 01:05:36 2014 +0300 +++ b/hedgewars/uConsts.pas Mon Nov 10 10:22:03 2014 -0500 @@ -151,7 +151,7 @@ cMaxHHIndex = 7; cMaxHHs = 48; - cMaxEdgePoints = 16384; + cMaxEdgePoints = 24576; cHHRadius = 9; cHHStepTicks = 29; diff -r b49b82351ad3 -r 1f58cb4aa773 hedgewars/uLandOutline.pas --- a/hedgewars/uLandOutline.pas Mon Nov 10 01:05:36 2014 +0300 +++ b/hedgewars/uLandOutline.pas Mon Nov 10 10:22:03 2014 -0500 @@ -144,6 +144,7 @@ tsq, tcb, t, r1, r2, r3, cx1, cx2, cy1, cy2: hwFloat; X, Y: LongInt; begin +if pa.Count >= cMaxEdgePoints-1 then exit; pi:= EndI; i:= StartI; ni:= Succ(StartI); @@ -173,7 +174,7 @@ cx2:= int2hwFloat(x2) + NVx; cy2:= int2hwFloat(y2) + NVy; t:= _0; - while t.Round = 0 do + while (t.Round = 0) and (pa.Count < cMaxEdgePoints-2) do begin tsq:= t * t; tcb:= tsq * t; @@ -186,7 +187,7 @@ pa.ar[pa.Count].x:= X; pa.ar[pa.Count].y:= Y; inc(pa.Count); - TryDo(pa.Count <= cMaxEdgePoints, 'Edge points overflow', true) + //TryDo(pa.Count <= cMaxEdgePoints, 'Edge points overflow', true) end; until i = StartI; pa.ar[pa.Count].x:= opa.ar[StartI].X; @@ -202,7 +203,7 @@ pa.Count:= 0; i:= 0; StartLoop:= 0; -while i < LongInt(opa.Count) do +while (i < LongInt(opa.Count)) and (pa.Count < cMaxEdgePoints-1) do if (opa.ar[i + 1].X = NTPX) then begin AddLoopPoints(pa, opa, StartLoop, i, Delta);