fixed wrong implementation of the new static variables

M4GNV5 · Aug 11, 2015 · 96f4c28 · 96f4c28
1 parent 95f9e94
commit 96f4c28
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 15 deletions.
diff --git a/src/api/cbjs.js b/src/api/cbjs.js
@@ -10,8 +10,6 @@ cplApi.MinecraftCommand = MinecraftCommand;
 cplApi.construct = function()
 {
 	var other = arguments[0];
-	if(other instanceof StaticVariable)
-		other = other.value;
 
 	var args = [];
 	for(var i = 1; i < arguments.length; i++)

diff --git a/src/api/math.js b/src/api/math.js
@@ -50,14 +50,14 @@ cplApi.math.pow = function(base, exponent)
 	var staticBase;
 	if(typeof base == 'number')
 		staticBase = base;
-	else if(base instanceof StaticVariable)
-		staticBase = base.value;
+	else if(base.type == 'number')
+		staticBase = base + 0;
 
 	var staticExponent;
 	if(typeof exponent == 'number')
 		staticExponent = exponent;
-	else if(exponent instanceof StaticVariable)
-		staticExponent = exponent.value;
+	else if(exponent.type == 'number')
+		staticExponent = exponent + 0;
 
 	if(typeof staticBase == 'number' && typeof staticExponent == 'number')
 		return Math.pow(staticBase, staticExponent);
@@ -77,8 +77,8 @@ cplApi.math.sin = function(value)
 {
 	if(typeof value == 'number')
 		return Math.sin(value);
-	else if(value instanceof StaticVariable)
-		return Math.sin(value.value);
+	else if(value.type == 'number')
+		return Math.sin(value + 0);
 
 	var next = startNewFunction();
 	var result = new Runtime.Decimal();
@@ -93,8 +93,8 @@ cplApi.math.sqrt = function(value)
 {
 	if(typeof value == 'number')
 		return Math.sqrt(value);
-	else if(value instanceof StaticVariable)
-		return Math.sqrt(value.value);
+	else if(value.type == 'number')
+		return Math.sqrt(value + 0);
 
 	var next = startNewFunction();
 	var result = new Runtime.Decimal();
@@ -109,8 +109,8 @@ cplApi.math.factorial = function(value)
 {
 	if(typeof value == 'number')
 		return staticFactorial(value);
-	else if(value instanceof StaticVariable)
-		return staticFactorial(value.value);
+	else if(value.type == 'number')
+		return staticFactorial(value + 0);
 
 	var next = startNewFunction();
 	var result = new Runtime.Decimal();

diff --git a/src/api/staticVar.js b/src/api/staticVar.js
@@ -1,8 +1,11 @@
 function createStaticVar(value, name)
 {
-	var type = typeof value;
-	value = new Object(value);
-	value.type = type;
+	if(typeof value.type == 'undefined') //is already a static var
+	{
+		var type = typeof value;
+		value = new Object(value);
+		value.type = type;
+	}
 
 	function _set(val)
 	{