# HG changeset patch # User nemo # Date 1426450483 14400 # Node ID 1af1a54d740b413ce125bc0d64af943db87dc963 # Parent 231d3e3d32675cbb0b5066bef3b7839470153cfe# Parent 4925438f5ab722fafd7f8c2d1f2f139d0589ec7a merge ☹ diff -r 4925438f5ab7 -r 1af1a54d740b hedgewars/uGearsList.pas --- a/hedgewars/uGearsList.pas Fri Mar 13 14:09:44 2015 +0300 +++ b/hedgewars/uGearsList.pas Sun Mar 15 16:14:43 2015 -0400 @@ -342,6 +342,8 @@ gear^.Radius:= 3; gear^.Friction:= _450 * _0_01 * cRopePercent; RopePoints.Count:= 0; + gear^.Tint:= $D8D8D8FF; + gear^.Tag:= 0; // normal rope render end; gtMine: begin gear^.ImpactSound:= sndMineImpact; diff -r 4925438f5ab7 -r 1af1a54d740b hedgewars/uGearsRender.pas --- a/hedgewars/uGearsRender.pas Fri Mar 13 14:09:44 2015 +0300 +++ b/hedgewars/uGearsRender.pas Sun Mar 15 16:14:43 2015 -0400 @@ -68,7 +68,8 @@ EnableTexture(false); //glEnable(GL_LINE_SMOOTH); - Tint($70, $70, $70, $FF); + + Tint(Gear^.Tint shr 24 div 3, Gear^.Tint shr 16 and $FF div 3, Gear^.Tint shr 8 and $FF div 3, Gear^.Tint and $FF); n:= RopePoints.Count + 2; @@ -79,7 +80,7 @@ glLineWidth(3.0 * cScaleFactor); glDrawArrays(GL_LINE_STRIP, 0, n); - Tint($D8, $D8, $D8, $FF); + Tint(Gear^.Tint); glLineWidth(2.0 * cScaleFactor); glDrawArrays(GL_LINE_STRIP, 0, n); @@ -169,7 +170,7 @@ var roplen, i: LongInt; begin if Gear^.Hedgehog^.Gear = nil then exit; - if (cReducedQuality and rqSimpleRope) <> 0 then + if (Gear^.Tag = 1) or ((cReducedQuality and rqSimpleRope) <> 0) then DrawRopeLinesRQ(Gear) else begin