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

JS player.ship.awardEquipmentToCurrentPylon() no longer silently halts the script when failing.

Browse Source 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3562 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Jens Ayton 2010-06-18 11:48:40 +00:00
parent 46c4badaa7
commit 94e8dfc093
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Core/Scripting/OOJSPlayerShip.m
View File

@ -545,29 +545,29 @@ static JSBool PlayerShipDisengageAutopilot(JSContext *context, JSObject *this, u
return YES;
}
// awardEquipmentToCurrentPylon(externalTank: equipmentInfoExpression)
// awardEquipmentToCurrentPylon(externalTank: equipmentInfoExpression) : Boolean
static JSBool PlayerShipAwardEquipmentToCurrentPylon(JSContext *context, JSObject *this, uintN argc, jsval *argv, jsval *outResult)
{
PlayerEntity *player = OOPlayerForScripting();
NSString *key = nil;
OOEquipmentType *eqType = nil;
BOOL OK = NO;
key = JSValueToEquipmentKey(context, argv[0]);
if (EXPECT_NOT(key == nil))
{
OOReportJSBadArguments(context, @"PlayerShip", @"awardEquipmentToCurrentPylon", argc, argv, nil, @"equipment type");
return OK;
return NO;
}
eqType = [OOEquipmentType equipmentTypeWithIdentifier:key];
if (EXPECT_NOT(![eqType isMissileOrMine]))
{
OOReportJSBadArguments(context, @"PlayerShip", @"awardEquipmentToCurrentPylon", argc, argv, nil, @"external store");
return OK;
return NO;
}
OK = [player assignToActivePylon:key];
//if (!OK) OOReportJSWarning(context, @"PlayerShip.awardEquipmentToCurrentPylon() could not award the specified equipment.");
return OK;
BOOL OK = [player assignToActivePylon:key];
*outResult = OK ? JSVAL_TRUE : JSVAL_FALSE;
return YES;
}