Droog71/oolite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Made the position variable optional in: system.addShips(role : String, count : Number[, position: Vector][, radius: Number]). When only the two first parameters are used, it now does the same as system.legacy_addShips(). This will avoid programming confusion.

Browse Source 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2917 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Eric Walch 2009-12-29 16:22:42 +00:00
parent 6670980465
commit c0b6f16429
1 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/Core/Scripting/OOJSSystem.m
View File

@ -684,7 +684,7 @@ static JSBool SystemFilteredEntities(JSContext *context, JSObject *this, uintN a
}
// addShips(role : String, count : Number, position: Vector[, radius: Number])
// addShips(role : String, count : Number[, position: Vector][, radius: Number])
static JSBool SystemAddShips(JSContext *context, JSObject *this, uintN argc, jsval *argv, jsval *outResult)
{
NSString *role = nil;
@ -711,20 +711,28 @@ static JSBool SystemAddShips(JSContext *context, JSObject *this, uintN argc, jsv
return NO;
}
if (!VectorFromArgumentListNoError(context, argc - 2, argv + 2, &where, &consumed))
if (argc < 3)
{
OOReportJSError(context, @"System.%@(): expected %@, got '%@'.", func, @"position", [NSString stringWithJavaScriptValue:argv[2] inContext:context]);
return NO;
where = kZeroVector;
radius = SCANNER_MAX_RANGE;
}
if (argc > 2 + consumed)
else
{
if (!JSVAL_IS_NUMBER(argv[2 + consumed]))
if (!VectorFromArgumentListNoError(context, argc - 2, argv + 2, &where, &consumed))
{
OOReportJSError(context, @"System.%@(): expected %@, got '%@'.", func, @"radius", [NSString stringWithJavaScriptValue:argv[2 + consumed] inContext:context]);
OOReportJSError(context, @"System.%@(): expected %@, got '%@'.", func, @"position", [NSString stringWithJavaScriptValue:argv[2] inContext:context]);
return NO;
}
JS_ValueToNumber(context, argv[2 + consumed], &radius);
if (argc > 2 + consumed)
{
if (!JSVAL_IS_NUMBER(argv[2 + consumed]))
{
OOReportJSError(context, @"System.%@(): expected %@, got '%@'.", func, @"radius", [NSString stringWithJavaScriptValue:argv[2 + consumed] inContext:context]);
return NO;
}
JS_ValueToNumber(context, argv[2 + consumed], &radius);
}
}
// Note: the use of witchspace-in effects (as in legacy_addShips). depends on proximity to the witchpoint.
@ -742,13 +750,15 @@ static JSBool SystemAddShips(JSContext *context, JSObject *this, uintN argc, jsv
return YES;
}
// addGroup(role : String, count : Number, position: Vector)
// addGroup(role : String, count : Number[, position: Vector][, radius: Number])
static JSBool SystemAddGroup(JSContext *context, JSObject *this, uintN argc, jsval *argv, jsval *outResult)
{
jsval result = [@"group" javaScriptValueInContext:context];
SystemAddShips(context, this, argc, argv, &result);
if (!result) return NO;
*outResult = result;
return YES;
@ -824,6 +834,8 @@ static JSBool SystemAddGroupToRoute(JSContext *context, JSObject *this, uintN ar
SystemAddShipsToRoute(context, this, argc, argv, &result);
if (!result) return NO;
*outResult = result;
return YES;