Mercurial Mercurial > sheepy-clone / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
For mikade's sake, use old dx/dy/frametick as default, so health crosses move the same
authornemo
Sun, 14 Aug 2011 17:49:12 -0400
changeset 5564 4f42009237df
parent 5563 fc73b6e941f7
child 5565 1a326ba319c9
For mikade's sake, use old dx/dy/frametick as default, so health crosses move the same
hedgewars/GSHandlers.inc file | annotate | diff | comparison | revisions
hedgewars/HHHandlers.inc file | annotate | diff | comparison | revisions
hedgewars/uGears.pas file | annotate | diff | comparison | revisions
hedgewars/uVisualGears.pas file | annotate | diff | comparison | revisions 
--- a/hedgewars/GSHandlers.inc	Sun Aug 14 17:42:26 2011 -0400
+++ b/hedgewars/GSHandlers.inc	Sun Aug 14 17:49:12 2011 -0400
@@ -3005,7 +3005,16 @@
     if (Gear^.Pos = 14) and (RealTicks and $3 = 0) then 
         begin
         heart:= AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtStraightShot);
-        if heart <> nil then heart^.State:= ord(sprSeduction);
+        if heart <> nil then 
+            with heart^ do
+                begin
+                dx:= 0.001 * (random(200));
+                dy:= 0.001 * (random(200));
+                if random(2) = 0 then dx := -dx;
+                if random(2) = 0 then dy := -dy;
+                FrameTicks:= random(750) + 1000;
+                heart^.State:= ord(sprSeduction)
+                end;
         end;
 
     if Gear^.Pos = 15 then
--- a/hedgewars/HHHandlers.inc	Sun Aug 14 17:42:26 2011 -0400
+++ b/hedgewars/HHHandlers.inc	Sun Aug 14 17:49:12 2011 -0400
@@ -586,13 +586,8 @@
                         if vga <> nil then
                             with vga^ do
                                 begin
-                                dx:= 0.001 * random(45);
-                                dy:= 0.001 * (random(20) + 25);
                                 Tint:= $00FF00FF;
-                                State:= ord(sprHealth);
-                                if random(2) = 0 then dx := -dx;
-                                Frame:= 0;
-                                FrameTicks:= random(750) + 1250;
+                                State:= ord(sprHealth)
                                 end;
                         inc(i, 5);
                         end;
--- a/hedgewars/uGears.pas	Sun Aug 14 17:42:26 2011 -0400
+++ b/hedgewars/uGears.pas	Sun Aug 14 17:49:12 2011 -0400
@@ -1093,13 +1093,8 @@
                     if vg <> nil then
                         with vg^ do
                             begin
-                            dx:= 0.001 * random(45);
-                            dy:= 0.001 * (random(20) + 25);
                             Tint:= $FF0000FF;
-                            State:= ord(sprHealth);
-                            if random(2) = 0 then dx := -dx;
-                            Frame:= 0;
-                            FrameTicks:= random(750) + 1250;
+                            State:= ord(sprHealth)
                             end;
                     inc(i, 5);
                     end;
--- a/hedgewars/uVisualGears.pas	Sun Aug 14 17:42:26 2011 -0400
+++ b/hedgewars/uVisualGears.pas	Sun Aug 14 17:49:12 2011 -0400
@@ -317,12 +317,12 @@
                 end;
 vgtSmoothWindBar: Tag:= hwRound(cWindSpeed * 72 / cMaxWindSpeed);
  vgtStraightShot: begin
-                dx:= 0.001 * (random(200));
-                dy:= 0.001 * (random(200));
+                dx:= 0.001 * random(45);
+                dy:= 0.001 * (random(20) + 25);
+                State:= ord(sprHealth);
                 if random(2) = 0 then dx := -dx;
-                if random(2) = 0 then dy := -dy;
                 Frame:= 0;
-                FrameTicks:= random(750) + 1000;
+                FrameTicks:= random(750) + 1250;
                 State:= ord(sprSnowDust);
                 end;
         end;
sheepy-clone