# HG changeset patch
# User sheepluva
# Date 1432587038 -7200
# Node ID 91d256bbd84018b4fcebd7acebee98153af9556d
# Parent  4f77e60146fcd701adc48ac8068572496f0f0816# Parent  b30f29396f0c00546a05f476974c782a406981e3
merge

diff -r 4f77e60146fc -r 91d256bbd840 ChangeLog.txt
--- a/ChangeLog.txt	Mon May 25 22:32:32 2015 +0200
+++ b/ChangeLog.txt	Mon May 25 22:50:38 2015 +0200
@@ -2,6 +2,7 @@
 * bugfixes
 
 0.9.21 -> 0.9.22
+ + Map previews can now take script parameters into account and preview waypoints in TechRacer
  + Added a couple new flags
  + Small improvements to the interface and in-game chat
  * Generated bridges/girders are now connected better to the land mass
diff -r 4f77e60146fc -r 91d256bbd840 share/hedgewars/Data/Scripts/Multiplayer/TechRacer.lua
--- a/share/hedgewars/Data/Scripts/Multiplayer/TechRacer.lua	Mon May 25 22:32:32 2015 +0200
+++ b/share/hedgewars/Data/Scripts/Multiplayer/TechRacer.lua	Mon May 25 22:50:38 2015 +0200
@@ -62,7 +62,7 @@
 HedgewarsScriptLoad("/Scripts/OfficialChallenges.lua")
 HedgewarsScriptLoad("/Scripts/Tracker.lua")
 HedgewarsScriptLoad("/Scripts/Params.lua")
-HedgewarsScriptLoad("/Scripts/TechMapsDev.lua")
+HedgewarsScriptLoad("/Scripts/TechMaps.lua")
 
 ------------------
 -- Got Variables?
diff -r 4f77e60146fc -r 91d256bbd840 share/hedgewars/Data/Scripts/TechMaps.lua
--- a/share/hedgewars/Data/Scripts/TechMaps.lua	Mon May 25 22:32:32 2015 +0200
+++ b/share/hedgewars/Data/Scripts/TechMaps.lua	Mon May 25 22:50:38 2015 +0200
@@ -26,6 +26,16 @@
 function LoadSprite(pX, pY, pSprite, pFrame, pTint, p1, p2, p3, pLandFlags)
 	PlaceSprite(pX, pY, pSprite, pFrame, pTint, p1, p2, p3, pLandFlags)
 end
+function PreviewWayPoint(x,y)
+    AddPoint(x,y,20)
+    AddPoint(x,y,19,true)
+    for i = 0,100,50 do
+        AddPoint(x-120,y+i,1,true)
+        AddPoint(x+120,y-i)
+        AddPoint(x-i,y+120,1,true)
+        AddPoint(x+i,y-120)
+    end
+end
 
 function PreviewGirder(x, y, f)
     if f == 0 then
@@ -68,6 +78,15 @@
 	if mapID == 4 then
 	---nice rope and airmines landflag testmap
     -- it'd be nice if these coordinates were stored somewhere generic so they didn't have to be edited twice. Some map array or something
+	PreviewWayPoint(337, 533)
+	PreviewWayPoint(1069, 1367)
+	PreviewWayPoint(884, 729)
+	PreviewWayPoint(1682, 464)
+	PreviewWayPoint(2773, 505)
+	PreviewWayPoint(3512, 929)
+	PreviewWayPoint(4002, 106)
+	PreviewWayPoint(3964, 1520)
+	PreviewWayPoint(2592, 1334)
 	PreviewGirder(194, 388, 7)
 	PreviewGirder(338, 334, 4)
 	PreviewGirder(484, 390, 5)