Partial fix of Pas2C parsing problems (part 1: uGearsHandlersMess)
authorWuzzy <Wuzzy2@mail.ru>
Tue, 24 Apr 2018 19:10:19 +0200
changeset 13346 0c3f612edc19
parent 13345 85644a45e988
child 13347 774dd8762607
Partial fix of Pas2C parsing problems (part 1: uGearsHandlersMess)
hedgewars/uGearsHandlersMess.pas
--- a/hedgewars/uGearsHandlersMess.pas	Sat Apr 21 17:17:42 2018 +0200
+++ b/hedgewars/uGearsHandlersMess.pas	Tue Apr 24 19:10:19 2018 +0200
@@ -1216,7 +1216,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 procedure spawnBulletTrail(Bullet: PGear; bulletX, bulletY: hwFloat; fadeIn: Boolean);
 var oX, oY: hwFloat;
-    fromX, fromY, toX, toY, dX, dY, length, stepLength: real;
+    fromX, fromY, toX, toY, dX, dY, bLength, stepLength: real;
     VGear: PVisualGear;
     i, steps: LongWord;
 begin
@@ -1238,9 +1238,9 @@
 
     dX:= toX - fromX;
     dY:= toY - fromY;
-    length:= sqrt(dX * dX + dY * dY);
-    dX:= dX / length;
-    dY:= dY / length;
+    bLength:= sqrt(dX * dX + dY * dY);
+    dX:= dX / bLength;
+    dY:= dY / bLength;
 
     if fadeIn then
         begin
@@ -1248,7 +1248,7 @@
         stepLength:= 12;
         fromX:= fromX + dX * 45;
         fromY:= fromY + dY * 45;
-        length:= length - 45;
+        bLength:= bLength - 45;
         end
     else steps:= 1;
 
@@ -1256,16 +1256,16 @@
         begin
             if i < steps - 1 then
                 begin
-                toX:= fromX + dX * minD(stepLength, length);
-                toY:= fromY + dY * minD(stepLength, length);
+                toX:= fromX + dX * minD(stepLength, bLength);
+                toY:= fromY + dY * minD(stepLength, bLength);
                 end
             else if steps > 1 then
                 begin
-                toX:= fromX + dX * length;
-                toY:= fromY + dY * length;
+                toX:= fromX + dX * bLength;
+                toY:= fromY + dY * bLength;
                 end;
 
-            if length > 0 then
+            if bLength > 0 then
                 begin
                 VGear := AddVisualGear(round(fromX), round(fromY), vgtLineTrail);
                 if VGear <> nil then
@@ -1293,7 +1293,7 @@
                 begin
                 fromX:= toX;
                 fromY:= toY;
-                length:= length - stepLength;
+                bLength:= bLength - stepLength;
                 end
         end;
 end;