Index: ps/trunk/binaries/data/mods/public/maps/scenarios/units_demo.js
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scenarios/units_demo.js	(revision 26774)
+++ ps/trunk/binaries/data/mods/public/maps/scenarios/units_demo.js	(revision 26775)
@@ -1,84 +1,90 @@
 /**
  * Whether to also place all actors.
  */
 let actors = false;
 
 /**
  * Coordinates of the first entity.
  */
 let startX = 20;
 let startZ = 20;
 
 /**
  * Horizontal coordinate of the last entity in the current row.
  */
-let stopX = 1580;
+let stopX = 1870;
 
 /**
  * Coordinates of the current entity.
  */
 let x = startX;
 let z = startZ;
 
 /**
  * Recall the greatest length in the current row to prevent overlapping.
  */
 let maxh = 0;
 
 /**
  * Space between entities.
  */
 let gap = 14;
 
 let cmpTemplateManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_TemplateManager);
 for (let template of cmpTemplateManager.FindAllTemplates(actors))
 {
 	print(template + "...\n");
 
 	let ent = Engine.AddEntity(template);
 	if (!ent)
 	{
 		error("Failed to load " + template + "\n");
 		continue;
 	}
 
 	let cmpFootprint = Engine.QueryInterface(ent, IID_Footprint);
 	if (!cmpFootprint)
 	{
 		print(template + " has no footprint\n");
 		continue;
 	}
 
 	let shape = cmpFootprint.GetShape();
 	let w = shape.width;
 	let h = shape.depth;
 
 	if (shape.type == 'circle')
 		w = h = shape.radius * 2;
 
 	if (x + w >= stopX)
 	{
 		// Start a new row
 		x = startX;
 		z += maxh + gap;
 		maxh = 0;
 	}
 
+	if (z >= stopX)
+	{
+		error(template + " would be placed out of map [" +(x + w / 2) + ", " + z + "]");
+		continue;
+	}
+
 	let cmpPosition = Engine.QueryInterface(ent, IID_Position);
 	if (!cmpPosition)
 	{
 		warn(template + " has no position\n");
 		Engine.DestroyEntity(ent);
 		continue;
 	}
 
-	cmpPosition.MoveTo(x + w / 2, z);
+	cmpPosition.JumpTo(x + w / 2, z);
 	cmpPosition.SetYRotation(Math.PI * 3 / 4);
 
 	let cmpOwnership = Engine.QueryInterface(ent, IID_Ownership);
 	if (cmpOwnership)
 		cmpOwnership.SetOwner(1);
 
 	x += w + gap;
 	maxh = Math.max(maxh, h);
 }
Index: ps/trunk/binaries/data/mods/public/maps/scenarios/units_demo.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scenarios/units_demo.xml	(revision 26774)
+++ ps/trunk/binaries/data/mods/public/maps/scenarios/units_demo.xml	(revision 26775)
@@ -1,50 +1,50 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <Scenario version="7">
-	<Terrain patches="25" texture="blackness" priority="0" height="16384"/>
+	<Terrain patches="30" texture="blackness" priority="0" height="4096"/>
 	<Environment>
 		<SkySet>default</SkySet>
 		<SunColor r="0.811765" g="0.792157" b="0.701961"/>
 		<SunElevation angle="0.785398"/>
 		<SunRotation angle="5.49779"/>
 		<AmbientColor r="0.313726" g="0.376471" b="0.521569"/>
 		<Water>
 			<WaterBody>
 				<Type>lake</Type>
 				<Color r="0.3" g="0.35" b="0.7"/>
 				<Height>5</Height>
 				<Waviness>4.0</Waviness>
 				<Murkiness>0.45</Murkiness>
 				<Tint r="0.28" g="0.3" b="0.59"/>
 			</WaterBody>
 		</Water>
 	</Environment>
 	<Camera>
 		<Position x="141.287" y="78.0967" z="32.4902"/>
 		<Rotation angle="0"/>
 		<Declination angle="0.523599"/>
 	</Camera>
 	<ScriptSettings><![CDATA[
 	{
 		"Name":"Units Demo",
 		"Description":"Every unit in the game.",
 		"Keywords": [
 			"demo"
 		],
 		"PlayerData":
 		[
 			{
 				"Civ":"athen"
 			}
 		],
 		"RevealMap":true,
 		"TriggerScripts": [
 			"scenarios/units_demo.js"
 		],
 		"VictoryConditions": []
 	}
 	]]></ScriptSettings>
 	<Entities/>
 	<Paths/>
 	<Triggers/>
 </Scenario>