From f3e17b4181977a9bc8c3118ea7cf29ee10bb41f1 Mon Sep 17 00:00:00 2001
From: walterhiggins <walter.higgins@gmail.com>
Date: Sun, 10 Feb 2013 17:51:27 +0000
Subject: [PATCH] removed unneeded load() calls

---
 src/main/javascript/drone/blocktype.js     | 46 +++++++++++-----------
 src/main/javascript/drone/castle.js        |  1 -
 src/main/javascript/drone/chessboard.js    |  2 -
 src/main/javascript/drone/cottage.js       |  1 -
 src/main/javascript/drone/dancefloor.js    |  1 -
 src/main/javascript/drone/fort.js          |  1 -
 src/main/javascript/drone/rainbow.js       | 23 +++++++++--
 src/main/javascript/drone/rboxcall.js      | 41 ++++++++++---------
 src/main/javascript/drone/sphere.js        |  1 -
 src/main/javascript/drone/spiral_stairs.js |  1 -
 src/main/javascript/drone/streamer.js      | 26 ++++++------
 src/main/javascript/drone/temple.js        |  1 -
 src/main/javascript/drone/test.js          |  2 -
 13 files changed, 73 insertions(+), 74 deletions(-)

diff --git a/src/main/javascript/drone/blocktype.js b/src/main/javascript/drone/blocktype.js
index e0abd21..69de1f6 100644
--- a/src/main/javascript/drone/blocktype.js
+++ b/src/main/javascript/drone/blocktype.js
@@ -1,5 +1,26 @@
-load(__folder + "drone.js");
+/************************************************************************
+Drone.blocktype() method
+========================
+Creates the text out of blocks. Useful for large-scale in-game signs.
 
+Parameters
+----------
+ 
+ * message - The message to create - (use `\n` for newlines)
+ * foregroundBlock (default: black wool) - The block to use for the foreground
+ * backgroundBlock (default: none) - The block to use for the background
+
+Example
+-------
+To create a 2-line high message using glowstone...
+
+    blocktype("Hello\nWorld",blocks.glowstone);
+
+![blocktype example][imgbt1]
+
+[imgbt1]: img/blocktype1.png
+
+***/
 (function(){
  
     var bitmaps = {
@@ -296,29 +317,6 @@ load(__folder + "drone.js");
             }
         }
     }
-/************************************************************************
-Drone.blocktype() method
-========================
-Creates the text out of blocks. Useful for large-scale in-game signs.
-
-Parameters
-----------
- 
- * message - The message to create - (use `\n` for newlines)
- * foregroundBlock (default: black wool) - The block to use for the foreground
- * backgroundBlock (default: none) - The block to use for the background
-
-Example
--------
-To create a 2-line high message using glowstone...
-
-    blocktype("Hello\nWorld",blocks.glowstone);
-
-![blocktype example][imgbt1]
-
-[imgbt1]: img/blocktype1.png
-
-***/
 
 
     //
diff --git a/src/main/javascript/drone/castle.js b/src/main/javascript/drone/castle.js
index 325542e..9cb9d46 100644
--- a/src/main/javascript/drone/castle.js
+++ b/src/main/javascript/drone/castle.js
@@ -1,4 +1,3 @@
-load(__folder + "drone.js");
 //
 // a castle is just a big wide fort with 4 taller forts at each corner
 //
diff --git a/src/main/javascript/drone/chessboard.js b/src/main/javascript/drone/chessboard.js
index b23191a..8c985bb 100644
--- a/src/main/javascript/drone/chessboard.js
+++ b/src/main/javascript/drone/chessboard.js
@@ -7,8 +7,6 @@
 *  width - width of the chessboard
 *  height - height of the chessboard
 */
-load(__folder + "drone.js");
-
 Drone.extend("chessboard", function(whiteBlock, blackBlock, width, depth) {
     this.chkpt('chessboard-start');
     width = width || 8;
diff --git a/src/main/javascript/drone/cottage.js b/src/main/javascript/drone/cottage.js
index e5ee154..e5a2321 100644
--- a/src/main/javascript/drone/cottage.js
+++ b/src/main/javascript/drone/cottage.js
@@ -1,4 +1,3 @@
-load(__folder + "drone.js");
 //
 // need to use the drone module to create buildings easily
 // it can be done using calls to putBlock(), putSign(), getPlayerPos() and getMousePos()
diff --git a/src/main/javascript/drone/dancefloor.js b/src/main/javascript/drone/dancefloor.js
index 1825421..651f5eb 100644
--- a/src/main/javascript/drone/dancefloor.js
+++ b/src/main/javascript/drone/dancefloor.js
@@ -1,4 +1,3 @@
-load(__folder + "drone.js")
 //
 // Create a floor of colored tiles some of which emit light.
 // The tiles change color every second creating a strobe-lit dance-floor.
diff --git a/src/main/javascript/drone/fort.js b/src/main/javascript/drone/fort.js
index 3783818..49aec69 100644
--- a/src/main/javascript/drone/fort.js
+++ b/src/main/javascript/drone/fort.js
@@ -1,4 +1,3 @@
-load(__folder + "drone.js");
 //
 // constructs a medieval fort
 // 
diff --git a/src/main/javascript/drone/rainbow.js b/src/main/javascript/drone/rainbow.js
index 5b102d1..13982f9 100644
--- a/src/main/javascript/drone/rainbow.js
+++ b/src/main/javascript/drone/rainbow.js
@@ -1,7 +1,22 @@
-load(__folder + "drone.js");
-/*
-  Creates a Rainbow
-*/
+/************************************************************************
+Drone.rainbox() method
+======================
+Creates a Rainbow.
+
+Parameters
+----------
+
+ * radius (optional - default:18) - The radius of the rainbow
+
+Example
+-------
+    
+    var d = new Drone();
+    d.rainbow(30);
+
+![rainbow example](img/rainbowex1.png)
+
+***/
 Drone.extend('rainbow', function(radius){
     if (typeof radius == "undefined")
         radius = 18;
diff --git a/src/main/javascript/drone/rboxcall.js b/src/main/javascript/drone/rboxcall.js
index af7019d..15b05e0 100644
--- a/src/main/javascript/drone/rboxcall.js
+++ b/src/main/javascript/drone/rboxcall.js
@@ -3,31 +3,30 @@
 * function and provide a new drone to it.
 *
 * Parameters:
-*	callback - any function that accepts a drone as its first argument
-*	probability - chance to invoke your callback on each iteration
-*	width - width of the region
-*	height - (Optional) height of the region, defaults to width
-*	depth - (Optional) depth of the cube, defaults to width
+*  callback - any function that accepts a drone as its first argument
+*  probability - chance to invoke your callback on each iteration
+*  width - width of the region
+*  height - (Optional) height of the region, defaults to width
+*  depth - (Optional) depth of the cube, defaults to width
 */
-load(__folder + "drone.js");
 
 Drone.extend("rboxcall", function(callback, probability, width, height, depth) {
-	this.chkpt('rboxcall-start');
+   this.chkpt('rboxcall-start');
 
-	for(var i = 0; i < width; ++i) {
-		this.move('rboxcall-start').right(i);
-		for(var j = 0; j < depth; ++j) {
-			this.move('rboxcall-start').right(i).fwd(j);
-			for(var k = 0; k < height; ++k) {
-				if(Math.random()*100 < probability) {
-					callback.call(null, new Drone(this.x, this.y, this.z));
-				}
-				this.up();
-			}
-		}
-	}
+   for(var i = 0; i < width; ++i) {
+      this.move('rboxcall-start').right(i);
+      for(var j = 0; j < depth; ++j) {
+         this.move('rboxcall-start').right(i).fwd(j);
+         for(var k = 0; k < height; ++k) {
+            if(Math.random()*100 < probability) {
+               callback.call(null, new Drone(this.x, this.y, this.z));
+            }
+            this.up();
+         }
+      }
+   }
 
-	this.move('rboxcall-start');
+   this.move('rboxcall-start');
 
-	return this;
+   return this;
 });
diff --git a/src/main/javascript/drone/sphere.js b/src/main/javascript/drone/sphere.js
index ed736ec..eaf6b8f 100644
--- a/src/main/javascript/drone/sphere.js
+++ b/src/main/javascript/drone/sphere.js
@@ -1,4 +1,3 @@
-load(__folder + "drone.js");
 /************************************************************************
 Drone.sphere() method
 =====================
diff --git a/src/main/javascript/drone/spiral_stairs.js b/src/main/javascript/drone/spiral_stairs.js
index b4eaf7f..c41bda6 100644
--- a/src/main/javascript/drone/spiral_stairs.js
+++ b/src/main/javascript/drone/spiral_stairs.js
@@ -1,4 +1,3 @@
-load(__folder + "drone.js");
 /************************************************************************
 Drone.spiral_stairs() method
 ============================
diff --git a/src/main/javascript/drone/streamer.js b/src/main/javascript/drone/streamer.js
index 3bf9b59..ffc3a53 100644
--- a/src/main/javascript/drone/streamer.js
+++ b/src/main/javascript/drone/streamer.js
@@ -2,20 +2,18 @@
 * Creates a stream of blocks in a given direction until it hits something other than air
 * 
 * Parameters:
-* 	block - blockId
-* 	dir - "up", "down", "left", "right", "fwd", "back
-* 	maxIterations - (Optional) maximum number of cubes to generate, defaults to 1000
+*  block - blockId
+*  dir - "up", "down", "left", "right", "fwd", "back
+*  maxIterations - (Optional) maximum number of cubes to generate, defaults to 1000
 */
-load(__folder + "drone.js");
-
 Drone.extend("streamer", function(block, dir, maxIterations) {
-	for(var i = 0; i < maxIterations||1000; ++i) {
-		this.box(block);
-		this[dir].call(this);
-		if(getBlock(this.x, this.y, this.z) !== "0:0") {
-			break;
-		}
-	}
-	
-	return this;
+   for(var i = 0; i < maxIterations||1000; ++i) {
+      this.box(block);
+      this[dir].call(this);
+      if(getBlock(this.x, this.y, this.z) !== "0:0") {
+         break;
+      }
+   }
+   
+   return this;
 });
diff --git a/src/main/javascript/drone/temple.js b/src/main/javascript/drone/temple.js
index ed71271..90ba27e 100644
--- a/src/main/javascript/drone/temple.js
+++ b/src/main/javascript/drone/temple.js
@@ -1,4 +1,3 @@
-load(__folder + "drone.js")
 //
 // constructs a mayan temple
 // 
diff --git a/src/main/javascript/drone/test.js b/src/main/javascript/drone/test.js
index 41ae1e9..1f30dd9 100644
--- a/src/main/javascript/drone/test.js
+++ b/src/main/javascript/drone/test.js
@@ -1,5 +1,3 @@
-load (__folder + "drone.js");
-
 Drone.prototype.testHorizontalStrokeWidth = function(){
     this.arc({
         blockType: 42,