Merge branch 'staging'

Conflicts:
	css/mapstyle.css
	globe.php

Signed-off-by: Patrick Davison <snapwilliam@gmail.com>

1 files changed, 47 insertions, 0 deletions

diff --git a/pages/gallery.php b/pages/gallery.php
index 68c17ae..259ac2a 100644
--- a/pages/gallery.php
+++ b/pages/gallery.php
@@ -79,7 +79,54 @@ $map = GenerateMap(
 	weight(3,3,3,4)					//Teleports
 );	
 
+//ABC's
+$map = GenerateMap(
+	19, 11, 12						,  		//width, height, rocks
+	weight(20,21,22,22,23)		,			//Walls
+	weight(3)						,			//Checkpoints
+	weight(0)									//Teleports
+);	
+
+//Ultra Complex
+$map = GenerateMap(
+	18, 16, 12						,  		//width, height, rocks
+	weight(16,17,18,18)			,			//Walls
+	weight(5)						,			//Checkpoints
+	weight(5)									//Teleports
+);	
+//Tall tall map
+$map = GenerateMap(
+	18, 14, 20						,  		//width, height, rocks
+	weight(30)						,			//Walls
+	weight(1)						,			//Checkpoints
+	weight(1)									//Teleports
+);	
+//Thirty
+$map = GenerateMap(
+	18, 14, 20						,  		//width, height, rocks
+	weight(30)						,			//Walls
+	weight(1)						,			//Checkpoints
+	weight(1)									//Teleports
+);	
+//Simple
+$map = GenerateMap(
+	18, 9, 7						,  		//width, height, rocks
+	weight(15,16,17)						,			//Walls
+	weight(0)						,			//Checkpoints
+	weight(0)									//Teleports
+);	
+//huge
+$map = GenerateMap(
+	75, 20, 7						,  		//width, height, rocks
+	weight(100)						,			//Walls
+	weight(5)						,			//Checkpoints
+	weight(4)									//Teleports
+);	
 
+$a[0] = 't';
+$a[1] = 't';
+$a['1'] = 'hi';
+echo $a[1];
 
 $mapdisplay = DisplayMap($map);
 $code = GenerateMapCode($map);